Simplify constructors with C++11

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

diff --git a/source/toggle.h b/source/toggle.h
index de8c5d2a71e91a9c193ddbbcbb01a0cdc6ecb0d7..7c572c51e98c74d18cbf5860e56d6460224afb23 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,10 +12,10 @@ 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 &);
@@ -27,17 +28,19 @@ 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"; }
 
-       virtual void autosize();
+private:
+       virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
        void set_text(const std::string &);
        void set_exclusive(bool);
        bool get_exclusive() const { return exclusive; }
@@ -53,6 +56,7 @@ private:
 public:
        virtual void button_press(int, int, unsigned);
        virtual void button_release(int, int, unsigned);
+       virtual bool navigate(Navigation);
 private:
        virtual void on_style_change();
 };