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

quartz: fix quartz build

Browse Source 
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
This commit is contained in:
Christian Hergert 2016-04-24 00:46:15 -07:00 committed by Christian Hergert
parent 4f63d83955
commit 0b88d7976c
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/Makefile.am
View File

@ -737,7 +737,6 @@ gtk_base_c_sources = \
gtkcsswidgetnode.c \ gtkcsswidgetnode.c \
gtkcsswin32sizevalue.c \ gtkcsswin32sizevalue.c \
gtkdialog.c \ gtkdialog.c \
gtkdragdest.c \
gtkdragsource.c \ gtkdragsource.c \
gtkdrawingarea.c \ gtkdrawingarea.c \
gtkeditable.c \ gtkeditable.c \
@ -959,7 +958,8 @@ gtk_base_c_sources += \
else else
gtk_base_c_sources += \ gtk_base_c_sources += \
gtkclipboard.c \ gtkclipboard.c \
gtkdnd.c gtkdnd.c \
gtkdragdest.c
endif endif
nodist_gtk_c_sources = nodist_gtk_c_sources =

10
gtk/gtkdnd-quartz.c
View File

@ -46,7 +46,6 @@
#include "gtkiconhelperprivate.h" #include "gtkiconhelperprivate.h"
typedef struct _GtkDragSourceInfo GtkDragSourceInfo; typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
typedef struct _GtkDragDestSite GtkDragDestSite;
typedef struct _GtkDragDestInfo GtkDragDestInfo; typedef struct _GtkDragDestInfo GtkDragDestInfo;
typedef struct _GtkDragFindData GtkDragFindData; typedef struct _GtkDragFindData GtkDragFindData;
@ -82,15 +81,6 @@ struct _GtkDragSourceInfo
gboolean delete; gboolean delete;
}; };
struct _GtkDragDestSite
{
GtkDestDefaults flags;
GtkTargetList *target_list;
GdkDragAction actions;
guint have_drag : 1;
guint track_motion : 1;
};
struct _GtkDragDestInfo struct _GtkDragDestInfo
{ {
GtkWidget *widget; /* Widget in which drag is in */ GtkWidget *widget; /* Widget in which drag is in */