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

GUI2: added a bunch of missing virtual specifiers

Browse source
This commit is contained in:
Charles Dang 2018-06-16 12:38:06 +11:00
parent ad7bc19dd9
commit d7edb83b16
7 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,13 +49,13 @@ public:
virtual unsigned get_state() const override;
/** Inherited from clickable_item. */
void connect_click_handler(const event::signal_function& signal) override
virtual void connect_click_handler(const event::signal_function& signal) override
{
connect_signal_mouse_left_click(*this, signal);
}
/** Inherited from clickable_item. */
void disconnect_click_handler(const event::signal_function& signal) override
virtual void disconnect_click_handler(const event::signal_function& signal) override
{
disconnect_signal_mouse_left_click(*this, signal);
}

18
src/gui/widgets/horizontal_scrollbar.hpp
View file

@ -38,34 +38,34 @@ public:
private:
/** Inherited from scrollbar_base. */
unsigned get_length() const override
virtual unsigned get_length() const override
{
return get_width();
}
/** Inherited from scrollbar_base. */
unsigned minimum_positioner_length() const override;
virtual unsigned minimum_positioner_length() const override;
/** Inherited from scrollbar_base. */
unsigned maximum_positioner_length() const override;
virtual unsigned maximum_positioner_length() const override;
/** Inherited from scrollbar_base. */
unsigned offset_before() const override;
virtual unsigned offset_before() const override;
/** Inherited from scrollbar_base. */
unsigned offset_after() const override;
virtual unsigned offset_after() const override;
/** Inherited from scrollbar_base. */
bool on_positioner(const point& coordinate) const override;
virtual bool on_positioner(const point& coordinate) const override;
/** Inherited from scrollbar_base. */
int on_bar(const point& coordinate) const override;
virtual int on_bar(const point& coordinate) const override;
/** Inherited from scrollbar_base. */
bool in_orthogonal_range(const point& coordinate) const override;
virtual bool in_orthogonal_range(const point& coordinate) const override;
/** Inherited from scrollbar_base. */
int get_length_difference(const point& original, const point& current) const override
virtual int get_length_difference(const point& original, const point& current) const override
{
return current.x - original.x;
}

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

@ -66,13 +66,13 @@ public:
virtual unsigned get_state() const override;
/** Inherited from clickable_item. */
void connect_click_handler(const event::signal_function& signal) override
virtual void connect_click_handler(const event::signal_function& signal) override
{
connect_signal_mouse_left_down(signal);
}
/** Inherited from clickable_item. */
void disconnect_click_handler(const event::signal_function& signal) override
virtual void disconnect_click_handler(const event::signal_function& signal) override
{
disconnect_signal_mouse_left_down(signal);
}

12
src/gui/widgets/slider.hpp
View file

@ -47,22 +47,22 @@ public:
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/** Inherited from integer_selector. */
void set_value(int value) override;
virtual void set_value(int value) override;
/** Inherited from integer_selector. */
int get_value() const override
virtual int get_value() const override
{
return minimum_value_ + get_slider_position() * get_step_size();
}
/** Inherited from integer_selector. */
int get_minimum_value() const override
virtual int get_minimum_value() const override
{
return minimum_value_;
}
/** Inherited from integer_selector. */
int get_maximum_value() const override
virtual int get_maximum_value() const override
{
// The number of items needs to include the begin and end so count - 1.
return minimum_value_ + slider_get_item_last() * step_size_;
@ -119,7 +119,7 @@ public:
protected:
/** Inherited from scrollbar_base. */
void child_callback_positioner_moved() override;
virtual void child_callback_positioner_moved() override;
private:
/** The best size for the slider part itself, if 0 ignored. */
@ -135,7 +135,7 @@ private:
int step_size_;
/** Inherited from scrollbar_base. */
unsigned get_length() const override
virtual unsigned get_length() const override
{
return get_width();
}

11
src/gui/widgets/toggle_button.hpp
View file

@ -52,17 +52,19 @@ public:
virtual unsigned get_state() const override;
/** Inherited from styled_widget. */
void update_canvas() override;
virtual void update_canvas() override;
/** Inherited from selectable_item */
unsigned get_value() const override
virtual unsigned get_value() const override
{
return state_num_;
}
/** Inherited from selectable_item */
unsigned num_states() const override;
virtual unsigned num_states() const override;
/** Inherited from selectable_item */
void set_value(unsigned selected, bool fire_event = false) override;
virtual void set_value(unsigned selected, bool fire_event = false) override;
/***** ***** ***** setters / getters for members ***** ****** *****/
@ -73,6 +75,7 @@ public:
icon_name_ = icon_name;
update_canvas();
}
const std::string& icon_name() const
{
return icon_name_;

6
src/gui/widgets/toggle_panel.hpp
View file

@ -90,16 +90,16 @@ public:
virtual point border_space() const override;
/** Inherited from selectable_item */
unsigned get_value() const override
virtual unsigned get_value() const override
{
return state_num_;
}
/** Inherited from selectable_item */
void set_value(unsigned selected, bool fire_event = false) override;
virtual void set_value(unsigned selected, bool fire_event = false) override;
/** Inherited from selectable_item */
unsigned num_states() const override;
virtual unsigned num_states() const override;
/***** ***** ***** setters / getters for members ***** ****** *****/

18
src/gui/widgets/vertical_scrollbar.hpp
View file

@ -35,34 +35,34 @@ public:
private:
/** Inherited from scrollbar_base. */
unsigned get_length() const override
virtual unsigned get_length() const override
{
return get_height();
}
/** Inherited from scrollbar_base. */
unsigned minimum_positioner_length() const override;
virtual unsigned minimum_positioner_length() const override;
/** Inherited from scrollbar_base. */
unsigned maximum_positioner_length() const override;
virtual unsigned maximum_positioner_length() const override;
/** Inherited from scrollbar_base. */
unsigned offset_before() const override;
virtual unsigned offset_before() const override;
/** Inherited from scrollbar_base. */
unsigned offset_after() const override;
virtual unsigned offset_after() const override;
/** Inherited from scrollbar_base. */
bool on_positioner(const point& coordinate) const override;
virtual bool on_positioner(const point& coordinate) const override;
/** Inherited from scrollbar_base. */
int on_bar(const point& coordinate) const override;
virtual int on_bar(const point& coordinate) const override;
/** Inherited from scrollbar_base. */
bool in_orthogonal_range(const point& coordinate) const override;
virtual bool in_orthogonal_range(const point& coordinate) const override;
/** Inherited from scrollbar_base. */
int get_length_difference(const point& original, const point& current) const override
virtual int get_length_difference(const point& original, const point& current) const override
{
return current.y - original.y;
}