Adjust things to conform to changes in other libraries

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

diff --git a/source/widget.h b/source/widget.h
index f1a83f78a5532c0e355306dcd826369d31caa1e3..555db7f4c8e2c87cd6d94128e209fc11c5c5a32b 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -40,6 +40,8 @@ public:
        sigc::signal<void> signal_request_focus;
        sigc::signal<void> signal_grab_pointer;
        sigc::signal<void> signal_ungrab_pointer;
+       sigc::signal<void, const Time::TimeDelta &> signal_request_animation;
+       sigc::signal<void> signal_rebuild_needed;
 
 protected:
        Geometry geom;
@@ -51,6 +53,8 @@ protected:
        Container *parent;
        std::string tooltip;
        PartCache part_cache;
+       bool rebuild_needed;
+       Time::TimeDelta anim_interval;
 
        Widget();
 private:
@@ -73,6 +77,7 @@ public:
        const Geometry &get_geometry() const { return geom; }
 
        void map_coords_to_ancestor(int &, int &, const Widget &) const;
+       void map_coords_to_root(int &, int &) const;
 
 protected:
        /** Sets the widget's parent Container.  The widget must be unparented when
@@ -125,6 +130,14 @@ public:
        State get_state() const { return state; }
 
 protected:
+       void set_animation_interval(const Time::TimeDelta &);
+       void stop_animation();
+public:
+       const Time::TimeDelta &get_animation_interval() const { return anim_interval; }
+
+protected:
+       void mark_rebuild();
+       virtual void rebuild_hierarchy();
        void rebuild();
        virtual void rebuild_special(const Part &);
 
@@ -148,10 +161,15 @@ public:
        virtual bool character(wchar_t) { return false; }
        virtual void focus_in();
        virtual void focus_out();
+       virtual bool navigate(Navigation) { return false; }
+       virtual void animate(const Time::TimeDelta &) { }
 protected:
-       virtual void on_geometry_change() { }
+       virtual void on_size_change() { on_geometry_change(); }
        virtual void on_style_change() { }
        virtual void on_reparent() { }
+
+       // Deprecated
+       virtual void on_geometry_change() { }
 };
 
 } // namespace GLtk