[gtk+/quartz-integration: 14/15] Fix up merge differences
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 14/15] Fix up merge differences
- Date: Sat, 16 Jul 2011 12:35:24 +0000 (UTC)
commit b47149c640ed2628c201f68f57b6a840672054d5
Author: John Ralls <jralls ceridwen us>
Date: Sat Jul 16 05:08:44 2011 -0700
Fix up merge differences
gtk/gtkdnd-quartz.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index dd7a1f1..c26c0c5 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -1119,6 +1119,7 @@ gtk_drag_begin_internal (GtkWidget *widget,
{
GtkDragSourceInfo *info;
GdkDragContext *context;
+ GdkDevice *pointer;
NSWindow *nswindow = get_toplevel_nswindow (widget);
NSPoint point = {(double)event->motion.x, (double)event->motion.y};
NSEvent *nsevent = [NSEvent mouseEventWithType: NSLeftMouseDown
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]