Rework how widget ownership works in Container

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

diff --git a/source/toggle.h b/source/toggle.h
index da129be2fa188f8af1ff24f7b6fa5bbd78e842b7..7da0e36996150d8256acfde03621a37d0f620fdd 100644 (file)
--- a/source/toggle.h
+++ b/source/toggle.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_TOGGLE_H_
 #define MSP_GLTK_TOGGLE_H_
 
 #include <sigc++/signal.h>
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
@@ -18,45 +12,55 @@ namespace GLtk {
 /**
 Allows toggling a value between two states.
 */
-class Toggle: public Widget
+class MSPGLTK_API Toggle: public Widget
 {
 public:
-       class Loader: public Widget::Loader
+       class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Toggle, Widget::Loader>
        {
        public:
                Loader(Toggle &);
-               Toggle &get_object() const;
+
        private:
-               virtual void finish();
+               void finish() override;
+
                void text(const std::string &);
        };
 
+       sigc::signal<void, bool> signal_toggled;
+
 private:
        Text text;
-       bool pressed;
-       bool value;
-       bool exclusive;
+       bool pressed = false;
+       bool value = false;
+       bool exclusive = false;
 
 public:
-       sigc::signal<void, bool> signal_toggled;
+       Toggle(const std::string & = std::string());
+
+       const char *get_class() const override { return "toggle"; }
 
-       Toggle(const Resources &, const std::string & =std::string());
+private:
+       void autosize_special(const Part &, Geometry &) const override;
 
+public:
        void set_text(const std::string &);
        void set_exclusive(bool);
        bool get_exclusive() const { return exclusive; }
+private:
+       void exclude_siblings();
+public:
        void set_value(bool);
        bool get_value() const { return value; }
 
-       virtual void button_press(int, int, unsigned);
-       virtual void button_release(int, int, unsigned);
 private:
-       virtual const char *get_class() const { return "toggle"; }
-       virtual void render_special(const Part &) const;
+       void rebuild_special(const Part &) override;
 
-       void exclude_siblings();
-
-       virtual void on_style_change();
+public:
+       void button_press(int, int, unsigned) override;
+       void button_release(int, int, unsigned) override;
+       bool navigate(Navigation) override;
+private:
+       void on_style_change() override;
 };
 
 } // namespace GLtk