Simplify constructors with C++11

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

diff --git a/source/root.h b/source/root.h
index b2e2409e71177734ee7996fd369c5a66c5b474ba..9ebe7cf57d823fdf59cf63d25829251f51b0b806 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -11,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 {
@@ -24,26 +25,26 @@ 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 = 0;
+       InputMethod *input_method = 0;
+       Input::Mouse *mouse = 0;
+       Input::Touchscreen *touchscreen = 0;
+       bool own_input = false;
+       Label *lbl_tooltip = 0;
+       int pointer_x = 0;
+       int pointer_y = 0;
        Time::TimeStamp tooltip_timeout;
        Time::TimeStamp last_tick;
-       Widget *tooltip_target;
+       Widget *tooltip_target = 0;
        Msp::GL::Camera camera;
-       Msp::GL::Program *shprog;
+       Msp::GL::Program *shprog = 0;
        Msp::GL::Blend blend;
 
 public:
@@ -54,9 +55,6 @@ 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:
        virtual ~Root();
 
        virtual const char *get_class() const { return "root"; }