X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=962b2e11908e0608b2ced7133274a0d0e648ec59;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=11d8bc7b3abf435a46fceb1444ac142d88312fda;hpb=df07e8f3e239b146cbc458d3cbd69758e590d255;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index 11d8bc7..962b2e1 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,10 +14,10 @@ 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 DataFile::DerivedObjectLoader<Button, Widget::Loader>
+	class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
 	{
 	public:
 		Loader(Button &);
@@ -28,26 +29,29 @@ 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"; }
 
-	virtual void autosize();
+private:
+	virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
 	void set_text(const std::string &);
 	void set_icon(const GL::Texture2D *);
 
 private:
-	virtual void rebuild_special(const Part &, CachedPart &);
+	virtual void rebuild_special(const Part &);
 
 public:
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);
 	virtual void pointer_motion(int, int);
+	virtual bool navigate(Navigation);
 private:
 	virtual void on_style_change();
 };