X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=08c135dc53578b4e3ca438cca65bba04f70d8d8e;hb=033732b500a35f3737bad515349d884cb3f123f0;hp=d13a4c094c22deade08f6fcbe9e0fcf4b656857a;hpb=aab3c89d03c1a99cb91ff1870775b2c44806bb79;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index d13a4c0..08c135d 100644
--- a/source/button.h
+++ b/source/button.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -10,6 +10,7 @@ Distributed under the LGPL
 
 #include <sigc++/sigc++.h>
 #include <msp/gl/texture2d.h>
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -26,26 +27,36 @@ public:
 	{
 	public:
 		Loader(Button &);
-		Button &get_object() const;
+	private:
+		void text(const std::string &);
 	};
 
+	sigc::signal<void> signal_clicked;
+
 private:
-	std::string text;
+	Text text;
 	const GL::Texture2D *icon;
 	bool pressed;
 
 public:
-	sigc::signal<void> signal_clicked;
+	Button(const std::string & = std::string());
+
+	virtual const char *get_class() const { return "button"; }
+
+	virtual void autosize();
 
-	Button(const Resources &, const std::string & =std::string());
 	void set_text(const std::string &);
 	void set_icon(const GL::Texture2D *);
+
+private:
+	virtual void render_special(const Part &) const;
+
+public:
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);
 	virtual void pointer_motion(int, int);
 private:
-	virtual const char *get_class() const { return "button"; }
-	virtual void render_special(const Part &) const;
+	virtual void on_style_change();
 };
 
 } // namespace GLtk