upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 21:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add C++11 override markers.

Browse Source 
Adds the markers for gui2::tcontainer_::get_client_rect.
This commit is contained in:
Mark de Wever 2013-04-13 09:42:25 +02:00
parent 111eefa94b
commit a8374fbe1d
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/widgets/container.cpp
View File

@ -24,6 +24,11 @@
namespace gui2 {
SDL_Rect tcontainer_::get_client_rect() const
{
return get_rectangle();
}
void tcontainer_::layout_initialise(const bool full_initialisation)
{
// Inherited.

9
src/gui/widgets/container.hpp
View File

@ -40,11 +40,14 @@ public:
}
/**
* Returns the size of the client area.
* Returns the client rect.
*
* The client area is the area available for widgets.
* The client rect is the area which is used for child items. The rest of
* the area of this widget is used for its own decoration.
*
* @returns The client rect.
*/
virtual SDL_Rect get_client_rect() const { return get_rectangle(); }
virtual SDL_Rect get_client_rect() const;
/***** ***** ***** ***** layout functions ***** ***** ***** *****/

11
src/gui/widgets/panel.hpp
View File

@ -40,15 +40,8 @@ public:
{
}
/**
* Returns the client rect.
*
* The client rect is the area which is used for child items. The rest of
* the area of this widget is used for its own decoration.
*
* @returns The client rect.
*/
virtual SDL_Rect get_client_rect() const;
/** See @ref tcontainer_::get_client_rect. */
virtual SDL_Rect get_client_rect() const OVERRIDE;
/** See @ref tcontrol::get_active. */
virtual bool get_active() const OVERRIDE;

8
src/gui/widgets/toggle_panel.hpp
View File

@ -64,13 +64,13 @@ public:
virtual unsigned get_state() const OVERRIDE;
/**
* Inherited from tpanel.
* See @ref tcontainer_::get_client_rect.
*
* @todo only due to the fact our definition is slightly different from
* tpanel_definition we need to override this function and do about the same,
* look at a way to 'fix' that.
* tpanel_definition we need to override this function and do about the
* same, look at a way to 'fix' that.
*/
SDL_Rect get_client_rect() const;
virtual SDL_Rect get_client_rect() const OVERRIDE;
/**
* Inherited from tpanel.