X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=e75ba9f33a53db37669b0ec34f6433d7ee0b8331;hb=c8291177b545ec81930603a5915234a60296db51;hp=8bd2d315c26cb8439ad3cb9a5cd30a7162f7f7f3;hpb=c062ca892fc6e10f74a76991b5d4b4349c046b5f;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index 8bd2d31..e75ba9f 100644
--- a/source/button.h
+++ b/source/button.h
@@ -2,26 +2,54 @@
 #define MSP_GLTK_BUTTON_H_
 
 #include <sigc++/sigc++.h>
+#include <msp/gl/texture2d.h>
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
+/**
+A clickable button widget.  Buttons can have a text label, which is displayed
+in a spacial part "text".
+*/
 class Button: public Widget
 {
 public:
+	class Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
+	{
+	public:
+		Loader(Button &);
+	private:
+		void text(const std::string &);
+	};
+
 	sigc::signal<void> signal_clicked;
 
-	Button(const Resources &, const std::string & =std::string());
-	void set_text(const std::string &);
-	void button_press(int, int, unsigned);
-	void button_release(int, int, unsigned);
 private:
-	std::string text;
+	Text text;
+	const GL::Texture2D *icon;
 	bool pressed;
 
-	const char *get_class() const { return "button"; }
-	void render_part(const Part &) const;
+public:
+	Button(const std::string & = std::string());
+
+	virtual const char *get_class() const { return "button"; }
+
+	virtual void autosize();
+
+	void set_text(const std::string &);
+	void set_icon(const GL::Texture2D *);
+
+private:
+	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);
+private:
+	virtual void on_style_change();
 };
 
 } // namespace GLtk