diff options
Diffstat (limited to 'scene/gui/option_button.h')
-rw-r--r-- | scene/gui/option_button.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scene/gui/option_button.h b/scene/gui/option_button.h index 04bd28fe28..fec7695969 100644 --- a/scene/gui/option_button.h +++ b/scene/gui/option_button.h @@ -35,7 +35,6 @@ #include "scene/gui/popup_menu.h" class OptionButton : public Button { - GDCLASS(OptionButton, Button); PopupMenu *popup; @@ -49,25 +48,25 @@ class OptionButton : public Button { Array _get_items() const; void _set_items(const Array &p_items); - virtual void pressed(); + virtual void pressed() override; protected: - Size2 get_minimum_size() const; + Size2 get_minimum_size() const override; void _notification(int p_what); static void _bind_methods(); public: - void add_icon_item(const Ref<Texture> &p_icon, const String &p_label, int p_id = -1); + void add_icon_item(const Ref<Texture2D> &p_icon, const String &p_label, int p_id = -1); void add_item(const String &p_label, int p_id = -1); void set_item_text(int p_idx, const String &p_text); - void set_item_icon(int p_idx, const Ref<Texture> &p_icon); + void set_item_icon(int p_idx, const Ref<Texture2D> &p_icon); void set_item_id(int p_idx, int p_id); void set_item_metadata(int p_idx, const Variant &p_metadata); void set_item_disabled(int p_idx, bool p_disabled); String get_item_text(int p_idx) const; - Ref<Texture> get_item_icon(int p_idx) const; + Ref<Texture2D> get_item_icon(int p_idx) const; int get_item_id(int p_idx) const; int get_item_index(int p_id) const; Variant get_item_metadata(int p_idx) const; @@ -88,7 +87,7 @@ public: PopupMenu *get_popup() const; - virtual void get_translatable_strings(List<String> *p_strings) const; + virtual void get_translatable_strings(List<String> *p_strings) const override; OptionButton(); ~OptionButton(); |