Adapt event handlers to library changes

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index ed3cd700564695a29ab8cde5262c04d057a6c6d6..da897713c8a57987d6f0bd0dcd81a5bde4ca1786 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -42,7 +42,7 @@ Designer::Designer(int argc, char **argv):
        keyboard(window),
        mouse(window),
        ui_res("r2c2.res"),
-       root(ui_res, window),
+       root(ui_res, &window, &keyboard, &mouse),
        base_object(0),
        cur_route(0),
        cur_zone(0),
@@ -106,9 +106,9 @@ Designer::Designer(int argc, char **argv):
        pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit");
 
        // Setup UI
-       keyboard.signal_button_press.connect(sigc::mem_fun(this, &Designer::key_press));
-       mouse.signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press));
-       mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Designer::axis_motion));
+       keyboard.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::key_press), false));
+       mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::button_press), false));
+       mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::axis_motion), false));
        root.signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip));
 
        toolbars.push_back(new Layoutbar(*this));