Make autosize_special const and add a const autosize overload

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

diff --git a/source/button.h b/source/button.h
index 687f5dd74e3cee22bd2310b0a02dc718feeda0b5..79045150a71a28f98d3a996ffa7cc907487dad42 100644 (file)
--- a/source/button.h
+++ b/source/button.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_BUTTON_H_
 #define MSP_GLTK_BUTTON_H_
 
@@ -23,7 +16,7 @@ in a spacial part "text".
 class Button: public Widget
 {
 public:
-       class Loader: public Widget::Loader
+       class Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
        {
        public:
                Loader(Button &);
@@ -31,24 +24,33 @@ 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());
+private:
+       virtual void autosize_special(const Part &, Geometry &) const;
+
+public:
        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 const char *get_class() const { return "button"; }
-       virtual void render_special(const Part &) const;
-
        virtual void on_style_change();
 };