Added comment explaining new Gtk::Dialog idiom.

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 32a1a20285488db206229d98a1ae8af149b5009e..0ba4432391277c27f9bacc895df3b8adeff679bb 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -30,16 +30,14 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
        gint x, y;
        double dx, dy;
        GdkEvent ev;
-       GdkModifierType mask;
-       GdkWindow evw (track_canvas->get_window().get_pointer (x, y, mask));
+       Gdk::ModifierType mask;
+       Glib::RefPtr<Gdk::Window> evw = track_canvas.get_window()->get_pointer (x, y, mask);
        bool doit = false;
 
-       if (use_track_canvas && gdk_window_get_pointer (track_canvas_event_box.get_window()->gobj(),
-                                                       &x, &y, &mask)) {
+       if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
                doit = true;
 
-       } else if (use_time_canvas && gdk_window_get_pointer (time_canvas_event_box.get_window()->gobj(),
-                                                             &x, &y, &mask)) {
+       } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
                doit = true;
        }
 
@@ -49,8 +47,7 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
                        selection->set (entered_regionview);
                }
 
-               gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &dx, &dy);
-
+               track_canvas.c2w(x, y, dx, dy);
                ev.type = GDK_BUTTON_PRESS;
                ev.button.x = dx;
                ev.button.y = dy;