Rework how widget ownership works in Container

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

diff --git a/source/toggle.h b/source/toggle.h
index 54becb9a3d1200c6b600d144875c2bf4ce53daa2..7da0e36996150d8256acfde03621a37d0f620fdd 100644 (file)
--- a/source/toggle.h
+++ b/source/toggle.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_TOGGLE_H_
 
 #include <sigc++/signal.h>
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
@@ -11,15 +12,17 @@ namespace GLtk {
 /**
 Allows toggling a value between two states.
 */
-class Toggle: public Widget
+class MSPGLTK_API Toggle: public Widget
 {
 public:
-       class Loader: public DataFile::DerivedObjectLoader<Toggle, Widget::Loader>
+       class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Toggle, Widget::Loader>
        {
        public:
                Loader(Toggle &);
+
        private:
-               virtual void finish();
+               void finish() override;
+
                void text(const std::string &);
        };
 
@@ -27,17 +30,17 @@ public:
 
 private:
        Text text;
-       bool pressed;
-       bool value;
-       bool exclusive;
+       bool pressed = false;
+       bool value = false;
+       bool exclusive = false;
 
 public:
        Toggle(const std::string & = std::string());
 
-       virtual const char *get_class() const { return "toggle"; }
+       const char *get_class() const override { return "toggle"; }
 
 private:
-       virtual void autosize_special(const Part &, Geometry &) const;
+       void autosize_special(const Part &, Geometry &) const override;
 
 public:
        void set_text(const std::string &);
@@ -50,13 +53,14 @@ public:
        bool get_value() const { return value; }
 
 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);
+       void button_press(int, int, unsigned) override;
+       void button_release(int, int, unsigned) override;
+       bool navigate(Navigation) override;
 private:
-       virtual void on_style_change();
+       void on_style_change() override;
 };
 
 } // namespace GLtk