Skip to content

Commit

Permalink
GUI2: added a bunch of missing virtual specifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz committed Jun 16, 2018
1 parent ad7bc19 commit d7edb83
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 35 deletions.
4 changes: 2 additions & 2 deletions src/gui/widgets/button.hpp
Expand Up @@ -49,13 +49,13 @@ class button : public styled_widget, public clickable_item
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);
}
Expand Down
18 changes: 9 additions & 9 deletions src/gui/widgets/horizontal_scrollbar.hpp
Expand Up @@ -38,34 +38,34 @@ class horizontal_scrollbar : public scrollbar_base

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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/repeating_button.hpp
Expand Up @@ -66,13 +66,13 @@ class repeating_button : public styled_widget, public clickable_item
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);
}
Expand Down
12 changes: 6 additions & 6 deletions src/gui/widgets/slider.hpp
Expand Up @@ -47,22 +47,22 @@ class slider : public slider_base, public integer_selector
/***** ***** ***** ***** 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_;
Expand Down Expand Up @@ -119,7 +119,7 @@ class slider : public slider_base, public integer_selector

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. */
Expand All @@ -135,7 +135,7 @@ class slider : public slider_base, public integer_selector
int step_size_;

/** Inherited from scrollbar_base. */
unsigned get_length() const override
virtual unsigned get_length() const override
{
return get_width();
}
Expand Down
11 changes: 7 additions & 4 deletions src/gui/widgets/toggle_button.hpp
Expand Up @@ -52,17 +52,19 @@ class toggle_button : public styled_widget, public selectable_item
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 ***** ****** *****/

Expand All @@ -73,6 +75,7 @@ class toggle_button : public styled_widget, public selectable_item
icon_name_ = icon_name;
update_canvas();
}

const std::string& icon_name() const
{
return icon_name_;
Expand Down
6 changes: 3 additions & 3 deletions src/gui/widgets/toggle_panel.hpp
Expand Up @@ -90,16 +90,16 @@ class toggle_panel : public panel, public selectable_item
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 ***** ****** *****/

Expand Down
18 changes: 9 additions & 9 deletions src/gui/widgets/vertical_scrollbar.hpp
Expand Up @@ -35,34 +35,34 @@ class vertical_scrollbar : public scrollbar_base

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;
}
Expand Down

0 comments on commit d7edb83

Please sign in to comment.