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 e99f16b2503ac568d589928d2ae1729c517d2aee..79045150a71a28f98d3a996ffa7cc907487dad42 100644 (file)
--- a/source/button.h
+++ b/source/button.h
@@ -16,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 &);
@@ -36,13 +36,15 @@ public:
 
        virtual const char *get_class() const { return "button"; }
 
-       virtual void autosize();
+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 &, CachedPart &);
+       virtual void rebuild_special(const Part &);
 
 public:
        virtual void button_press(int, int, unsigned);