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

diff --git a/source/root.cpp b/source/root.cpp
index 5ea447f..167b3f7 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -11,7 +11,7 @@ namespace Msp {
 namespace GLtk {
 
 Root::Root(Resources &r, Graphics::Window &window):
-	Root(r, &window, new Input::Keyboard(window), new Input::Mouse(window), 0)
+	Root(r, &window, new Input::Keyboard(window), new Input::Mouse(window), nullptr)
 {
 	own_input = true;
 }
@@ -78,7 +78,7 @@ void Root::tick()
 	if(tooltip_timeout && Time::now()>tooltip_timeout)
 	{
 		std::string tip;
-		if(Widget *wdg = get_descendant_at(pointer_x, pointer_y))
+		if(Widget *wdg = find_descendant_at(pointer_x, pointer_y))
 		{
 			tip = wdg->get_tooltip();
 			tooltip_target = wdg;
@@ -133,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);
 }
 
@@ -185,11 +185,11 @@ bool Root::axis_motion_event(unsigned, float, float)
 			pointer_y = y;
 			tooltip_timeout = Time::now()+700*Time::msec;
 		}
-		else if(get_descendant_at(x, y)!=tooltip_target)
+		else if(find_descendant_at(x, y)!=tooltip_target)
 		{
 			if(lbl_tooltip)
 				lbl_tooltip->set_visible(false);
-			tooltip_target = 0;
+			tooltip_target = nullptr;
 		}
 
 		if(pointer_focus)