mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-04 20:17:29 +00:00
Add C++11 override markers.
Adds the markers for gui2::tcontainer_::set_self_active.
This commit is contained in:
parent
41dec28e86
commit
d9b0154497
@ -387,6 +387,11 @@ void tlist::layout_children(const bool force)
|
||||
}
|
||||
}
|
||||
|
||||
void tlist::set_self_active(const bool active)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
const std::string& tlist::get_control_type() const
|
||||
{
|
||||
static const std::string type = "list";
|
||||
|
@ -264,8 +264,8 @@ private:
|
||||
/** Inherited from tscrollbar_container. */
|
||||
virtual void set_content_size(const tpoint& origin, const tpoint& size);
|
||||
#endif
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool) {}
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
|
||||
/** See @ref tcontrol::get_control_type. */
|
||||
virtual const std::string& get_control_type() const OVERRIDE;
|
||||
|
@ -234,6 +234,11 @@ void tlistbox::list_item_clicked(twidget* caller)
|
||||
assert(false);
|
||||
}
|
||||
|
||||
void tlistbox::set_self_active(const bool /*active*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
bool tlistbox::update_content_size()
|
||||
{
|
||||
if(get_visible() == twidget::tvisible::invisible) {
|
||||
|
@ -173,10 +173,8 @@ public:
|
||||
/** Function to call after the user clicked on a row. */
|
||||
void list_item_clicked(twidget* caller);
|
||||
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool /*active*/) {}
|
||||
// { state_ = active ? ENABLED : DISABLED; }
|
||||
//
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
|
||||
/**
|
||||
* Request to update the size of the content after changing the content.
|
||||
|
@ -172,6 +172,9 @@ const std::string& tmulti_page::get_control_type() const
|
||||
return type;
|
||||
}
|
||||
|
||||
void tmulti_page::set_self_active(const bool /*active*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
} // namespace gui2
|
||||
|
||||
|
||||
|
@ -165,8 +165,8 @@ private:
|
||||
/** See @ref tcontrol::get_control_type. */
|
||||
virtual const std::string& get_control_type() const OVERRIDE;
|
||||
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool /*active*/) {}
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
};
|
||||
|
||||
} // namespace gui2
|
||||
|
@ -110,5 +110,10 @@ const std::string& tpanel::get_control_type() const
|
||||
return type;
|
||||
}
|
||||
|
||||
void tpanel::set_self_active(const bool /*active*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
} // namespace gui2
|
||||
|
||||
|
@ -75,9 +75,8 @@ private:
|
||||
/** See @ref tcontainer_::border_space. */
|
||||
virtual tpoint border_space() const OVERRIDE;
|
||||
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool /*active*/) {}
|
||||
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
};
|
||||
|
||||
} // namespace gui2
|
||||
|
@ -74,6 +74,11 @@ void tscroll_label::set_use_markup(bool use_markup)
|
||||
}
|
||||
}
|
||||
|
||||
void tscroll_label::set_self_active(const bool active)
|
||||
{
|
||||
state_ = active ? ENABLED : DISABLED;
|
||||
}
|
||||
|
||||
bool tscroll_label::get_active() const
|
||||
{
|
||||
return state_ != DISABLED;
|
||||
|
@ -46,9 +46,8 @@ public:
|
||||
/** See @ref tcontrol::set_use_markup. */
|
||||
virtual void set_use_markup(bool use_markup) OVERRIDE;
|
||||
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool active)
|
||||
{ state_ = active ? ENABLED : DISABLED; }
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
|
||||
/***** ***** ***** setters / getters for members ***** ****** *****/
|
||||
|
||||
|
@ -43,5 +43,10 @@ const std::string& tscrollbar_panel::get_control_type() const
|
||||
return type;
|
||||
}
|
||||
|
||||
void tscrollbar_panel::set_self_active(const bool /*active*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
} // namespace gui2
|
||||
|
||||
|
@ -56,9 +56,8 @@ private:
|
||||
/** See @ref tcontrol::get_control_type. */
|
||||
virtual const std::string& get_control_type() const OVERRIDE;
|
||||
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool /*active*/) {}
|
||||
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
};
|
||||
|
||||
} // namespace gui2
|
||||
|
@ -109,5 +109,10 @@ const std::string& tstacked_widget::get_control_type() const
|
||||
return type;
|
||||
}
|
||||
|
||||
void tstacked_widget::set_self_active(const bool /*active*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
} // namespace gui2
|
||||
|
||||
|
@ -68,8 +68,8 @@ private:
|
||||
/** See @ref tcontrol::get_control_type. */
|
||||
virtual const std::string& get_control_type() const OVERRIDE;
|
||||
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool /*active*/) {}
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
};
|
||||
|
||||
} // namespace gui2
|
||||
|
@ -97,6 +97,11 @@ void ttree_view::child_populate_dirty_list(twindow& caller
|
||||
root_node_->impl_populate_dirty_list(caller, call_stack);
|
||||
}
|
||||
|
||||
void ttree_view::set_self_active(const bool /*active*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
bool ttree_view::empty() const
|
||||
{
|
||||
return root_node_->empty();
|
||||
|
@ -58,9 +58,8 @@ public:
|
||||
twindow& caller
|
||||
, const std::vector<twidget*>& call_stack) OVERRIDE;
|
||||
|
||||
/** Inherited from tcontainer_. */
|
||||
void set_self_active(const bool /*active*/) {}
|
||||
// { state_ = active ? ENABLED : DISABLED; }
|
||||
/** See @ref tcontainer_::set_self_active. */
|
||||
virtual void set_self_active(const bool active) OVERRIDE;
|
||||
|
||||
bool empty() const;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user