summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-12-30 03:06:25 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-12-30 03:06:25 +0000
commit25b46464e3eeb2dab0a1365d2fe171b4fda5f490 (patch)
tree79e7c74d8395f18cc215c463199d5392aa183887 /gtk2_ardour/editor_canvas.cc
parentd43cc4e7b5e95d4f4a8ed4d8fff99b6f846fe074 (diff)
dnd to canvas now working again
git-svn-id: svn://localhost/trunk/ardour2@215 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r--gtk2_ardour/editor_canvas.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 029ddb4408..8e91715576 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -95,16 +95,15 @@ Editor::initialize_canvas ()
track_canvas.signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
/* set up drag-n-drop */
- vector<Gtk::TargetEntry> target_table;
+ vector<TargetEntry> target_table;
target_table.push_back (TargetEntry ("STRING"));
target_table.push_back (TargetEntry ("text/plain"));
target_table.push_back (TargetEntry ("text/uri-list"));
target_table.push_back (TargetEntry ("application/x-rootwin-drop"));
- // GTK2FIX
- // track_canvas.drag_dest_set (target_table, DEST_DEFAULT_ALL, GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE));
- // track_canvas.signal_drag_data_received().connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
+ track_canvas.drag_dest_set (target_table);
+ track_canvas.signal_drag_data_received().connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
/* stuff for the verbose canvas cursor */
@@ -424,8 +423,8 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context
double wx;
double wy;
- track_canvas.c2w( x, y, wx, wy);
-
+ track_canvas.window_to_world ( x, y, wx, wy);
+
ev.type = GDK_BUTTON_RELEASE;
ev.button.x = wx;
ev.button.y = wy;