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

diff --git a/source/toggle.h b/source/toggle.h
index b6195e1..7da0e36 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,16 +12,17 @@ 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 &);
 	};
 
@@ -28,17 +30,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"; }
+	const char *get_class() const override { return "toggle"; }
 
-	virtual void autosize();
+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; }
@@ -49,13 +53,14 @@ public:
 	bool get_value() const { return value; }
 
 private:
-	virtual void render_special(const Part &) const;
+	void rebuild_special(const Part &) override;
 
 public:
-	virtual void button_press(int, int, unsigned);
-	virtual void button_release(int, int, unsigned);
+	void button_press(int, int, unsigned) override;
+	void button_release(int, int, unsigned) override;
+	bool navigate(Navigation) override;
 private:
-	virtual void on_style_change();
+	void on_style_change() override;
 };
 
 } // namespace GLtk