Make autosize_special const and add a const autosize overload

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

diff --git a/source/entry.h b/source/entry.h
index 0bba6f0fbe0e26cd74018b81610d4a4a12b27aec..541675f7cb60799a3bf7cb3b50ef55154079aa78 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,6 +22,15 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
+       class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
+       {
+       public:
+               Loader(Entry &);
+
+       private:
+               void multiline(bool);
+       };
+
        sigc::signal<void> signal_enter;
 
 private:
@@ -41,8 +50,10 @@ public:
 
        virtual const char *get_class() const { return "entry"; }
 
-       virtual void autosize();
+private:
+       virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
        void set_text(const std::string &);
        const std::string &get_text() const { return text.get(); }
 
@@ -54,7 +65,7 @@ public:
        bool is_multiline() const { return multiline; }
 
 private:
-       virtual void rebuild_special(const Part &, CachedPart &);
+       virtual void rebuild_special(const Part &);
        virtual void render_special(const Part &, GL::Renderer &) const;
 
 public: