X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.h;h=54becb9a3d1200c6b600d144875c2bf4ce53daa2;hb=f0b600c3b1739f7e088da6ab8eb7c2e67adf592c;hp=24dfe4867651081163a0302b88b902092213fefb;hpb=91997dd3189b93a67179822ec2fed5f2a7bddb74;p=libs%2Fgltk.git

diff --git a/source/toggle.h b/source/toggle.h
index 24dfe48..54becb9 100644
--- a/source/toggle.h
+++ b/source/toggle.h
@@ -1,10 +1,3 @@
-/* $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_
 
@@ -21,16 +14,17 @@ Allows toggling a value between two states.
 class Toggle: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Toggle, Widget::Loader>
 	{
 	public:
 		Loader(Toggle &);
-		Toggle &get_object() const;
 	private:
 		virtual void finish();
 		void text(const std::string &);
 	};
 
+	sigc::signal<void, bool> signal_toggled;
+
 private:
 	Text text;
 	bool pressed;
@@ -38,24 +32,30 @@ private:
 	bool exclusive;
 
 public:
-	sigc::signal<void, bool> signal_toggled;
-
 	Toggle(const std::string & = std::string());
 
+	virtual const char *get_class() const { return "toggle"; }
+
+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; }
+private:
+	void exclude_siblings();
+public:
 	void set_value(bool);
 	bool get_value() const { return value; }
 
+private:
+	virtual void rebuild_special(const Part &);
+
+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;
-
-	void exclude_siblings();
-
 	virtual void on_style_change();
 };