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

Add C++11 override markers.

Browse Source 
Adds the markers for gui2::tcontainer_::border_space.
This commit is contained in:
Mark de Wever 2013-04-13 11:09:12 +02:00
parent a8374fbe1d
commit 41dec28e86
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,5 +219,10 @@ void tcontainer_::init_grid(
grid_builder->build(&initial_grid());
}
tpoint tcontainer_::border_space() const
{
return tpoint(0, 0);
}
} // namespace gui2

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

@ -216,7 +216,7 @@ private:
virtual tgrid& initial_grid() { return grid_; }
/** Returns the space used by the border. */
virtual tpoint border_space() const { return tpoint(0, 0); }
virtual tpoint border_space() const;
/**
* Helper for set_active.

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

@ -72,8 +72,8 @@ private:
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const OVERRIDE;
/** Inherited from tcontainer_. */
tpoint border_space() const;
/** See @ref tcontainer_::border_space. */
virtual tpoint border_space() const OVERRIDE;
/** Inherited from tcontainer_. */
void set_self_active(const bool /*active*/) {}

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

@ -73,13 +73,13 @@ public:
virtual SDL_Rect get_client_rect() const OVERRIDE;
/**
* Inherited from tpanel.
* See @ref tcontainer_::border_space.
*
* @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.
*/
tpoint border_space() const;
virtual tpoint border_space() const OVERRIDE;
/** Inherited from tselectable_ */
bool get_value() const { return state_ >= ENABLED_SELECTED; }