X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=0fe624f4c4e3f5d03e7fab70ee4bc00d594cd20e;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=52e23cae677ee6f03df4ee48a8f25d35400954d9;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index 52e23ca..0fe624f 100644
--- a/source/root.h
+++ b/source/root.h
@@ -32,19 +32,19 @@ public:
 
 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;
 	Time::TimeStamp last_tick;
-	Widget *tooltip_target;
+	Widget *tooltip_target = nullptr;
 	Msp::GL::Camera camera;
-	Msp::GL::Program *shprog;
+	Msp::GL::Program *shprog = nullptr;
 	Msp::GL::Blend blend;
 
 public:
@@ -54,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"; }