X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=687f5dd74e3cee22bd2310b0a02dc718feeda0b5;hb=a87d05583cb7dffaf0e0f5eb9f9b2fc0bcf656e1;hp=55cb2b0a28af82c7e930ee4603f166cf06a84850;hpb=1fde94c15fc65e85f5931a9daf74dd8806e682e0;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index 55cb2b0..687f5dd 100644
--- a/source/button.h
+++ b/source/button.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,6 +9,8 @@ Distributed under the LGPL
 #define MSP_GLTK_BUTTON_H_
 
 #include <sigc++/sigc++.h>
+#include <msp/gl/texture2d.h>
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -25,11 +27,13 @@ public:
 	{
 	public:
 		Loader(Button &);
-		Button &get_object() const;
+	private:
+		void text(const std::string &);
 	};
 
 private:
-	std::string text;
+	Text text;
+	const GL::Texture2D *icon;
 	bool pressed;
 
 public:
@@ -37,13 +41,15 @@ public:
 
 	Button(const Resources &, const std::string & =std::string());
 	void set_text(const std::string &);
+	void set_icon(const GL::Texture2D *);
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);
-	virtual void pointer_enter();
-	virtual void pointer_leave();
+	virtual void pointer_motion(int, int);
 private:
 	virtual const char *get_class() const { return "button"; }
-	virtual void render_part(const Part &) const;
+	virtual void render_special(const Part &) const;
+
+	virtual void on_style_change();
 };
 
 } // namespace GLtk