Rearrange members

[libs/gltk.git] / source / button.h

diff --git a/source/button.h b/source/button.h
index b84511e310707655e70bc1c76392394e86f3634c..8d4c3c6c2de27081ecf782bdf127035f0c0b9167 100644 (file)
--- 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,25 +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"; }
+
        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();
 };