0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Menu Button: cleaned up a duplicate member

Browse source 
This makes the member name consistent with that used by other widgets.
This commit is contained in:
Charles Dang 2016-10-16 16:36:57 +11:00
parent 7e84adf348
commit a5350ea9f9
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/widgets/menu_button.cpp
View file

@ -160,8 +160,8 @@ void tmenu_button::signal_handler_left_button_click(const event::tevent event,
fire(event::NOTIFY_MODIFIED, *this, nullptr);
if(selected_callback_) {
selected_callback_(*this);
if(callback_state_change_) {
callback_state_change_(*this);
}
if(retval_ != 0) {

4
src/gui/widgets/menu_button.hpp
View file

@ -82,7 +82,7 @@ public:
/** Inherited from tselectable_ */
virtual void set_callback_state_change(std::function<void(twidget&)> callback) override
{
selected_callback_ = callback;
callback_state_change_ = callback;
}
/** Returns the value of the selected row */
@ -125,8 +125,6 @@ private:
*/
int selected_;
std::function<void(twidget&)> selected_callback_;
/** See @ref tcontrol::get_control_type. */
virtual const std::string& get_control_type() const override;