Rework how widget ownership works in Container

[libs/gltk.git] / source / button.h

diff --git a/source/button.h b/source/button.h
index e99f16b2503ac568d589928d2ae1729c517d2aee..22426ca5399f6ba9c6f69c866150247f9e584d7a 100644 (file)
--- a/source/button.h
+++ b/source/button.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/sigc++.h>
 #include <msp/gl/texture2d.h>
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
@@ -13,13 +14,14 @@ namespace GLtk {
 A clickable button widget.  Buttons can have a text label, which is displayed
 in a spacial part "text".
 */
-class Button: public Widget
+class MSPGLTK_API Button: public Widget
 {
 public:
-       class Loader: public Widget::Loader
+       class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
        {
        public:
                Loader(Button &);
+
        private:
                void text(const std::string &);
        };
@@ -28,28 +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"; }
 
-       virtual void autosize();
+private:
+       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 &, CachedPart &);
+       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);
+       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