X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=376b9d53c819beec1b2f4548d771571535073b8e;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=ef83bb9de3af842b8fe37878d1f4eb2185d36c12;hpb=6deafc9f236b90175a303944815f7c0eac1c95c1;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index ef83bb9..376b9d5 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), nullptr)
 {
-	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();
 
@@ -148,7 +133,7 @@ void Root::render(GL::Renderer &renderer, GL::Tag tag) const
 	renderer.set_camera(camera);
 	renderer.set_shader_program(shprog);
 	renderer.set_blend(&blend);
-	renderer.set_depth_test(0);
+	renderer.set_depth_test(nullptr);
 	Widget::render(renderer);
 }
 
@@ -204,7 +189,7 @@ bool Root::axis_motion_event(unsigned, float, float)
 		{
 			if(lbl_tooltip)
 				lbl_tooltip->set_visible(false);
-			tooltip_target = 0;
+			tooltip_target = nullptr;
 		}
 
 		if(pointer_focus)