[gtk+] quartz: fix quartz build
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] quartz: fix quartz build
- Date: Sun, 24 Apr 2016 10:50:39 +0000 (UTC)
commit 0b88d7976ccd69e74f4023156edb284a33f6b21e
Author: Christian Hergert <christian hergert me>
Date: Sun Apr 24 00:46:15 2016 -0700
quartz: fix quartz build
The quartz backend has its own implementation of these that
collide since the gtkdragdest.c extraction.
https://bugzilla.gnome.org/show_bug.cgi?id=764712
gtk/Makefile.am | 4 ++--
gtk/gtkdnd-quartz.c | 10 ----------
2 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e546073..180c423 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -737,7 +737,6 @@ gtk_base_c_sources = \
gtkcsswidgetnode.c \
gtkcsswin32sizevalue.c \
gtkdialog.c \
- gtkdragdest.c \
gtkdragsource.c \
gtkdrawingarea.c \
gtkeditable.c \
@@ -959,7 +958,8 @@ gtk_base_c_sources += \
else
gtk_base_c_sources += \
gtkclipboard.c \
- gtkdnd.c
+ gtkdnd.c \
+ gtkdragdest.c
endif
nodist_gtk_c_sources =
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 7fe27b6..6198986 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -46,7 +46,6 @@
#include "gtkiconhelperprivate.h"
typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
-typedef struct _GtkDragDestSite GtkDragDestSite;
typedef struct _GtkDragDestInfo GtkDragDestInfo;
typedef struct _GtkDragFindData GtkDragFindData;
@@ -82,15 +81,6 @@ struct _GtkDragSourceInfo
gboolean delete;
};
-struct _GtkDragDestSite
-{
- GtkDestDefaults flags;
- GtkTargetList *target_list;
- GdkDragAction actions;
- guint have_drag : 1;
- guint track_motion : 1;
-};
-
struct _GtkDragDestInfo
{
GtkWidget *widget; /* Widget in which drag is in */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]