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

diff --git a/source/button.h b/source/button.h
index 687f5dd..8d4c3c6 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
 */
 
@@ -31,24 +31,29 @@ public:
 		void text(const std::string &);
 	};
 
+	sigc::signal<void> signal_clicked;
+
 private:
 	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"; }
 
-	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();
 };