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

Add C++11 override markers.

Browse Source 
Adds the markers for gui2::twidget::has_widget.
This commit is contained in:
Mark de Wever 2013-04-08 11:20:19 +02:00
parent fa963dab94
commit 07e825b039
3 changed files with 9 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

@ -77,6 +77,11 @@ void tcontainer_::place(const tpoint& origin, const tpoint& size)
grid_.place(client_position, client_size);
}
bool tcontainer_::has_widget(const twidget* widget) const
{
return twidget::has_widget(widget) || grid_.has_widget(widget);
}
tpoint tcontainer_::calculate_best_size() const
{
log_scope2(log_gui_layout, LOG_SCOPE_HEADER);

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

@ -94,9 +94,8 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** Inherited from twidget.*/
bool has_widget(const twidget* widget) const
{ return twidget::has_widget(widget) || grid_.has_widget(widget); }
/** See @ref twidget::has_widget. */
virtual bool has_widget(const twidget* widget) const OVERRIDE;
/** See @ref twidget::set_origin. */
virtual void set_origin(const tpoint& origin) OVERRIDE;

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

@ -267,8 +267,8 @@ public:
const std::string& id
, const bool must_be_active) const OVERRIDE;
/** Inherited from twidget.*/
bool has_widget(const twidget* widget) const;
/** See @ref twidget::has_widget. */
virtual bool has_widget(const twidget* widget) const OVERRIDE;
/** See @ref twidget::disable_click_dismiss. */
bool disable_click_dismiss() const OVERRIDE;