X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=844fe88c30fe786d9c460030f35a87ad11f78a10;hb=HEAD;hp=2af9cf9d02c520b8cc1beb39f6b5f12230f249c5;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git diff --git a/source/button.h b/source/button.h index 2af9cf9..22426ca 100644 --- a/source/button.h +++ b/source/button.h @@ -21,6 +21,7 @@ public: { public: Loader(Button &); + private: void text(const std::string &); }; @@ -29,31 +30,31 @@ public: private: Text text; - const GL::Texture2D *icon; - bool pressed; + const GL::Texture2D *icon = nullptr; + bool pressed = false; public: Button(const std::string & = std::string()); - virtual const char *get_class() const { return "button"; } + const char *get_class() const override { return "button"; } private: - virtual void autosize_special(const Part &, Geometry &) const; + void autosize_special(const Part &, Geometry &) const override; public: void set_text(const std::string &); void set_icon(const GL::Texture2D *); private: - virtual void rebuild_special(const Part &); + void rebuild_special(const Part &) override; public: - virtual void button_press(int, int, unsigned); - virtual void button_release(int, int, unsigned); - virtual void pointer_motion(int, int); - virtual bool navigate(Navigation); + void button_press(int, int, unsigned) override; + void button_release(int, int, unsigned) override; + void pointer_motion(int, int) override; + bool navigate(Navigation) override; private: - virtual void on_style_change(); + void on_style_change() override; }; } // namespace GLtk