diff options
| author | Richard Hult <richard@imendio.com> | 2007-11-01 08:45:30 +0000 |
|---|---|---|
| committer | Richard Hult <rhult@src.gnome.org> | 2007-11-01 08:45:30 +0000 |
| commit | 5cb67473391b0f426d6c51e17769e481d39114f2 (patch) | |
| tree | 6bc528a31aad039c1018b2522792a2ce6aef1d62 /gtk | |
| parent | c6c14a3abd13238f469bb65ff5423550070c5283 (diff) | |
| download | gtk+-5cb67473391b0f426d6c51e17769e481d39114f2.tar.gz | |
Redo the fix for bug #492117, by adding a getter for the private drag
2007-11-01 Richard Hult <richard@imendio.com>
* gdk/quartz/GdkQuartzWindow.c:
* gdk/quartz/GdkQuartzWindow.h:
* gdk/quartz/gdkdnd-quartz.c:
* gdk/quartz/gdkquartz.h:
* gtk/gtkdnd-quartz.c: Redo the fix for bug #492117, by adding a
getter for the private drag context info so we don't need to
expose so much in the public quartz header file.
svn path=/trunk/; revision=18959
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkdnd-quartz.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c index 606aaf0856..4bfc34e7f2 100644 --- a/gtk/gtkdnd-quartz.c +++ b/gtk/gtkdnd-quartz.c @@ -181,12 +181,15 @@ gtk_drag_get_data (GtkWidget *widget, GdkAtom target, guint32 time) { - id <NSDraggingInfo> dragging_info = GDK_DRAG_CONTEXT_PRIVATE (context)->dragging_info; - NSPasteboard *pasteboard = [dragging_info draggingPasteboard]; + id <NSDraggingInfo> dragging_info; + NSPasteboard *pasteboard; GtkSelectionData *selection_data; GtkDragDestInfo *info; GtkDragDestSite *site; + dragging_info = gdk_quartz_drag_context_get_dragging_info_libgtk_only (context); + pasteboard = [dragging_info draggingPasteboard]; + info = gtk_drag_get_dest_info (context, FALSE); site = g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"); @@ -976,8 +979,8 @@ gtk_drag_dest_find_target (GtkWidget *widget, GdkDragContext *context, GtkTargetList *target_list) { - id <NSDraggingInfo> dragging_info = GDK_DRAG_CONTEXT_PRIVATE (context)->dragging_info; - NSPasteboard *pasteboard = [dragging_info draggingPasteboard]; + id <NSDraggingInfo> dragging_info; + NSPasteboard *pasteboard; GtkWidget *source_widget; GList *tmp_target; GList *tmp_source = NULL; @@ -987,6 +990,9 @@ gtk_drag_dest_find_target (GtkWidget *widget, g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), GDK_NONE); g_return_val_if_fail (!context->is_source, GDK_NONE); + dragging_info = gdk_quartz_drag_context_get_dragging_info_libgtk_only (context); + pasteboard = [dragging_info draggingPasteboard]; + source_widget = gtk_drag_get_source_widget (context); if (target_list == NULL) |