X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Froot.cpp;fp=source%2Froot.cpp;h=5ea447fecdf46d48f0013aa3f832e5aef9fe8348;hp=ef83bb9de3af842b8fe37878d1f4eb2185d36c12;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hpb=b4a3d651f57c46507aaa99a71a14fea15f0e430d

diff --git a/source/root.cpp b/source/root.cpp
index ef83bb9..5ea447f 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -11,35 +11,20 @@ namespace Msp {
 namespace GLtk {
 
 Root::Root(Resources &r, Graphics::Window &window):
-	resources(r),
-	keyboard(new Input::Keyboard(window)),
-	input_method(0),
-	mouse(new Input::Mouse(window)),
-	touchscreen(0),
-	own_input(true)
+	Root(r, &window, new Input::Keyboard(window), new Input::Mouse(window), 0)
 {
-	init(&window);
+	own_input = true;
 }
 
 Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
 	resources(r),
 	keyboard(k),
-	input_method(0),
 	mouse(m),
-	touchscreen(t),
-	own_input(false)
-{
-	init(window);
-}
-
-void Root::init(Graphics::Window *window)
+	touchscreen(t)
 {
 	if(window)
 		set_geometry(Geometry(0, 0, window->get_width(), window->get_height()));
 
-	lbl_tooltip = 0;
-	tooltip_target = 0;
-
 	camera.set_orthographic(geom.w, geom.h);
 	update_camera();