Adjust things to conform to changes in other libraries

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

diff --git a/source/root.h b/source/root.h
index 7d5a592805f187a096e1fbc5e6f1a40822981d78..b2e2409e71177734ee7996fd369c5a66c5b474ba 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_ROOT_H_
 
 #include <sigc++/trackable.h>
+#include <msp/gl/blend.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/program.h>
 #include <msp/gl/renderable.h>
@@ -39,9 +40,11 @@ private:
        int pointer_x;
        int pointer_y;
        Time::TimeStamp tooltip_timeout;
+       Time::TimeStamp last_tick;
        Widget *tooltip_target;
        Msp::GL::Camera camera;
        Msp::GL::Program *shprog;
+       Msp::GL::Blend blend;
 
 public:
        /** Creates a Root widget for a window.  The geometry is set to match the
@@ -63,8 +66,8 @@ public:
        virtual unsigned get_height() const { return geom.h; }
 
        void tick();
-       void render() const;
-       virtual void render(GL::Renderer &, const GL::Tag & = GL::Tag()) const;
+       virtual void setup_frame(GL::Renderer &);
+       virtual void render(GL::Renderer &, GL::Tag = GL::Tag()) const;
 
 private:
        bool button_press_event(unsigned);
@@ -78,7 +81,7 @@ private:
        void get_touch(unsigned, int &, int &);
        void update_camera();
 
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_child_added(Widget &);
 };