diff --git a/LibGUI/GButton.h b/LibGUI/GButton.h index 2bd69bef74..d5897a5d7a 100644 --- a/LibGUI/GButton.h +++ b/LibGUI/GButton.h @@ -23,6 +23,8 @@ public: void set_button_style(GButtonStyle style) { m_button_style = style; } GButtonStyle button_style() const { return m_button_style; } + virtual const char* class_name() const override { return "GButton"; } + private: virtual void paint_event(GPaintEvent&) override; virtual void mousedown_event(GMouseEvent&) override; @@ -31,8 +33,6 @@ private: virtual void enter_event(GEvent&) override; virtual void leave_event(GEvent&) override; - virtual const char* class_name() const override { return "GButton"; } - String m_caption; RetainPtr m_icon; GButtonStyle m_button_style { GButtonStyle::Normal }; diff --git a/LibGUI/GCheckBox.h b/LibGUI/GCheckBox.h index d6978bd22f..c31549d67b 100644 --- a/LibGUI/GCheckBox.h +++ b/LibGUI/GCheckBox.h @@ -17,13 +17,14 @@ public: Function on_change; + virtual const char* class_name() const override { return "GCheckBox"; } + private: virtual void paint_event(GPaintEvent&) override; virtual void mousedown_event(GMouseEvent&) override; virtual void mouseup_event(GMouseEvent&) override; virtual void mousemove_event(GMouseEvent&) override; virtual void keydown_event(GKeyEvent&) override; - virtual const char* class_name() const override { return "GCheckBox"; } virtual bool accepts_focus() const override { return true; } String m_caption; diff --git a/LibGUI/GFilePicker.h b/LibGUI/GFilePicker.h index 56ea97228b..c223bb7901 100644 --- a/LibGUI/GFilePicker.h +++ b/LibGUI/GFilePicker.h @@ -5,6 +5,7 @@ public: GFilePicker(); virtual ~GFilePicker() override; -private: virtual const char* class_name() const override { return "GFilePicker"; } + +private: }; diff --git a/LibGUI/GLabel.h b/LibGUI/GLabel.h index 6f1e9fc700..1b886c7981 100644 --- a/LibGUI/GLabel.h +++ b/LibGUI/GLabel.h @@ -22,11 +22,11 @@ public: TextAlignment text_alignment() const { return m_text_alignment; } void set_text_alignment(TextAlignment text_alignment) { m_text_alignment = text_alignment; } + virtual const char* class_name() const override { return "GLabel"; } + private: virtual void paint_event(GPaintEvent&) override; - virtual const char* class_name() const override { return "GLabel"; } - String m_text; RetainPtr m_icon; TextAlignment m_text_alignment { TextAlignment::Center }; diff --git a/LibGUI/GListBox.h b/LibGUI/GListBox.h index 1b04b4d3ca..b2c1bd705f 100644 --- a/LibGUI/GListBox.h +++ b/LibGUI/GListBox.h @@ -10,10 +10,11 @@ public: void add_item(String&&); int selected_index() const { return m_selected_index; } + virtual const char* class_name() const override { return "GListBox"; } + private: virtual void paint_event(GPaintEvent&) override; virtual void mousedown_event(GMouseEvent&) override; - virtual const char* class_name() const override { return "GListBox"; } virtual bool accepts_focus() const override { return true; } Rect item_rect(int index) const; diff --git a/LibGUI/GScrollBar.h b/LibGUI/GScrollBar.h index af98b161e9..dca2c08475 100644 --- a/LibGUI/GScrollBar.h +++ b/LibGUI/GScrollBar.h @@ -24,12 +24,13 @@ public: Function on_change; + virtual const char* class_name() const override { return "GScrollBar"; } + private: virtual void paint_event(GPaintEvent&) override; virtual void mousedown_event(GMouseEvent&) override; virtual void mouseup_event(GMouseEvent&) override; virtual void mousemove_event(GMouseEvent&) override; - virtual const char* class_name() const override { return "GScrollBar"; } int button_size() const { return orientation() == Orientation::Vertical ? width() : height(); } Rect up_button_rect() const; diff --git a/LibGUI/GStackWidget.h b/LibGUI/GStackWidget.h index 97c55d920d..0cac593682 100644 --- a/LibGUI/GStackWidget.h +++ b/LibGUI/GStackWidget.h @@ -10,12 +10,12 @@ public: GWidget* active_widget() const { return m_active_widget; } void set_active_widget(GWidget*); + virtual const char* class_name() const override { return "GStackWidget"; } + protected: virtual void child_event(GChildEvent&) override; virtual void resize_event(GResizeEvent&) override; private: - virtual const char* class_name() const override { return "GStackWidget"; } - GWidget* m_active_widget { nullptr }; }; diff --git a/LibGUI/GStatusBar.h b/LibGUI/GStatusBar.h index 18ccb0ca59..d01648ff52 100644 --- a/LibGUI/GStatusBar.h +++ b/LibGUI/GStatusBar.h @@ -12,8 +12,9 @@ public: String text() const; void set_text(String&&); -private: virtual const char* class_name() const override { return "GStatusBar"; } + +private: virtual void paint_event(GPaintEvent&) override; GLabel* m_label { nullptr }; diff --git a/LibGUI/GTextBox.h b/LibGUI/GTextBox.h index af511d85f4..7988eb3964 100644 --- a/LibGUI/GTextBox.h +++ b/LibGUI/GTextBox.h @@ -14,8 +14,9 @@ public: Function on_return_pressed; Function on_change; -private: virtual const char* class_name() const override { return "GTextBox"; } + +private: virtual void paint_event(GPaintEvent&) override; virtual void mousedown_event(GMouseEvent&) override; virtual void keydown_event(GKeyEvent&) override; diff --git a/LibGUI/GTextEditor.h b/LibGUI/GTextEditor.h index 14f00ddca4..fc0469c593 100644 --- a/LibGUI/GTextEditor.h +++ b/LibGUI/GTextEditor.h @@ -100,6 +100,8 @@ public: Function on_return_pressed; + virtual const char* class_name() const override { return "GTextEditor"; } + private: virtual void paint_event(GPaintEvent&) override; virtual void resize_event(GResizeEvent&) override; diff --git a/LibGUI/GToolBar.h b/LibGUI/GToolBar.h index 483eac238f..6834664498 100644 --- a/LibGUI/GToolBar.h +++ b/LibGUI/GToolBar.h @@ -12,8 +12,9 @@ public: void add_action(Retained&&); void add_separator(); -private: virtual const char* class_name() const override { return "GToolBar"; } + +private: virtual void paint_event(GPaintEvent&) override; struct Item {