Use nullptr instead of 0 for pointers

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

diff --git a/source/root.h b/source/root.h
index 7d5a592805f187a096e1fbc5e6f1a40822981d78..0fe624f4c4e3f5d03e7fab70ee4bc00d594cd20e 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>
@@ -10,6 +11,7 @@
 #include <msp/input/mouse.h>
 #include <msp/input/touchscreen.h>
 #include <msp/time/timestamp.h>
+#include "mspgltk_api.h"
 #include "panel.h"
 
 namespace Msp {
@@ -23,25 +25,27 @@ input from keyboard and mouse.  It can be used by itself or in a GL::Pipeline.
 Due to its specialized nature it's recommended to not use it with Scenes or
 other containers.
 */
-class Root: public Panel, public GL::Renderable, public sigc::trackable
+class MSPGLTK_API Root: public Panel, public GL::Renderable, public sigc::trackable
 {
 public:
        sigc::signal<std::string, int, int> signal_tooltip;
 
 private:
        Resources &resources;
-       Input::Keyboard *keyboard;
-       InputMethod *input_method;
-       Input::Mouse *mouse;
-       Input::Touchscreen *touchscreen;
-       bool own_input;
-       Label *lbl_tooltip;
-       int pointer_x;
-       int pointer_y;
+       Input::Keyboard *keyboard = nullptr;
+       InputMethod *input_method = nullptr;
+       Input::Mouse *mouse = nullptr;
+       Input::Touchscreen *touchscreen = nullptr;
+       bool own_input = false;
+       Label *lbl_tooltip = nullptr;
+       int pointer_x = 0;
+       int pointer_y = 0;
        Time::TimeStamp tooltip_timeout;
-       Widget *tooltip_target;
+       Time::TimeStamp last_tick;
+       Widget *tooltip_target = nullptr;
        Msp::GL::Camera camera;
-       Msp::GL::Program *shprog;
+       Msp::GL::Program *shprog = nullptr;
+       Msp::GL::Blend blend;
 
 public:
        /** Creates a Root widget for a window.  The geometry is set to match the
@@ -50,10 +54,7 @@ public:
 
        /** Creates a Root widget with custom input devices.  If window is not null,
        it is used to set the widget's initial geometry. */
-       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
-private:
-       void init(Graphics::Window *);
-public:
+       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = nullptr);
        virtual ~Root();
 
        virtual const char *get_class() const { return "root"; }
@@ -63,8 +64,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 +79,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 &);
 };