Rearrange members

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

diff --git a/source/toggle.h b/source/toggle.h
index f01f84bd0ba632c8596f80d1fdbce5f66b0c2907..ff65440a66f49fd1cc87bae8993b3c48c13b572a 100644 (file)
--- a/source/toggle.h
+++ b/source/toggle.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #define MSP_GLTK_TOGGLE_H_
 
 #include <sigc++/signal.h>
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -27,26 +28,39 @@ public:
                Toggle &get_object() const;
        private:
                virtual void finish();
+               void text(const std::string &);
        };
 
+       sigc::signal<void, bool> signal_toggled;
+
 private:
-       std::string text;
+       Text text;
        bool pressed;
        bool value;
+       bool exclusive;
 
 public:
-       sigc::signal<void, bool> signal_toggled;
+       Toggle(const std::string & = std::string());
 
-       Toggle(const Resources &);
+       virtual const char *get_class() const { return "toggle"; }
 
+       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; }
 
+private:
+       virtual void render_special(const Part &) const;
+
+public:
        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;
+       virtual void on_style_change();
 };
 
 } // namespace GLtk