callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quartz: Fix building

Browse Source 
Broken by 6d04183c5d and 6ac07a2e85
This commit is contained in:
Patrick Griffis
2015-07-27 09:33:32 -04:00
parent 49a596aa52
commit ee73e27fd7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/quartz/GdkQuartzNSWindow.c
View File

@ -665,14 +665,14 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
event->dnd.send_event = FALSE;
event->dnd.context = g_object_ref (_gdk_quartz_drag_source_context);
screen = gdk_window_get_screen (event.dnd.window);
screen = gdk_window_get_screen (event->dnd.window);
if (screen)
{
GList* windows, *list;
gint gx, gy;
event.dnd.context->dest_window = NULL;
event->dnd.context->dest_window = NULL;
windows = gdk_screen_get_toplevel_windows (screen);
_gdk_quartz_window_nspoint_to_gdk_xy (aPoint, &gx, &gy);
@ -688,7 +688,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
wh = gdk_window_get_height (win);
if (gx > wx && gy > wy && gx <= wx + ww && gy <= wy + wh)
event.dnd.context->dest_window = win;
event->dnd.context->dest_window = win;
}
}

7
gtk/gtkdnd-quartz.c
View File

@ -62,7 +62,8 @@ static void gtk_drag_source_site_destroy (gpointer data);
static GtkDragSourceInfo *gtk_drag_get_source_info (GdkDragContext *context,
gboolean create);
static void gtk_drag_drop_finished (GtkDragSourceInfo *info);
static void gtk_drag_drop_finished (GtkDragSourceInfo *info,
GtkDragResult result);
extern GdkDragContext *gdk_quartz_drag_source_context (); /* gdk/quartz/gdkdnd-quartz.c */
@ -1399,7 +1400,7 @@ gtk_drag_cancel (GdkDragContext *context)
info = gtk_drag_get_source_info (context, FALSE);
if (info != NULL)
gtk_drag_drop_finished (info);
gtk_drag_drop_finished (info, GTK_DRAG_RESULT_ERROR);
}
static gboolean
@ -2068,7 +2069,7 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info,
if (!success)
g_signal_emit_by_name (info->source_widget, "drag-failed",
info->context, GTK_DRAG_RESULT_NO_TARGET, &success);
info->context, result, &success);
if (success && info->delete)
g_signal_emit_by_name (info->source_widget, "drag-data-delete",