X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=22426ca5399f6ba9c6f69c866150247f9e584d7a;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=31009c731ec1d3cae065e98ca0e286f771aee1f2;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index 31009c7..22426ca 100644
--- a/source/button.h
+++ b/source/button.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/sigc++.h>
 #include <msp/gl/texture2d.h>
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
@@ -13,13 +14,14 @@ namespace GLtk {
 A clickable button widget.  Buttons can have a text label, which is displayed
 in a spacial part "text".
 */
-class Button: public Widget
+class MSPGLTK_API Button: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
 	{
 	public:
 		Loader(Button &);
+
 	private:
 		void text(const std::string &);
 	};
@@ -28,28 +30,31 @@ public:
 
 private:
 	Text text;
-	const GL::Texture2D *icon;
-	bool pressed;
+	const GL::Texture2D *icon = nullptr;
+	bool pressed = false;
 
 public:
 	Button(const std::string & = std::string());
 
-	virtual const char *get_class() const { return "button"; }
+	const char *get_class() const override { return "button"; }
 
-	virtual void autosize();
+private:
+	void autosize_special(const Part &, Geometry &) const override;
 
+public:
 	void set_text(const std::string &);
 	void set_icon(const GL::Texture2D *);
 
 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);
-	virtual void pointer_motion(int, int);
+	void button_press(int, int, unsigned) override;
+	void button_release(int, int, unsigned) override;
+	void pointer_motion(int, int) override;
+	bool navigate(Navigation) override;
 private:
-	virtual void on_style_change();
+	void on_style_change() override;
 };
 
 } // namespace GLtk