X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.h;h=2b38ffc2084f023ac0ea011f9720b58e85e2195f;hb=6d9570c97584758e3cfcac6827d439b7fb844cf4;hp=fd7e762734ab295ad25be775ba5568f4970a5b75;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/toggle.h b/source/toggle.h
index fd7e762..2b38ffc 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,15 @@ 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 +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"; }
+	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 +51,14 @@ public:
 	bool get_value() const { return value; }
 
 private:
-	virtual void rebuild_special(const Part &, CachedPart &);
+	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