X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.h;h=7c572c51e98c74d18cbf5860e56d6460224afb23;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=b6195e1d470f65a79ddd5e450ca5f2fbfce1cc7c;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/toggle.h b/source/toggle.h
index b6195e1..7c572c5 100644
--- 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,14 +12,13 @@ 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 text(const std::string &);
@@ -28,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; }
@@ -49,11 +51,12 @@ public:
 	bool get_value() const { return value; }
 
 private:
-	virtual void render_special(const Part &) const;
+	virtual void rebuild_special(const Part &);
 
 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();
 };