AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'quartz-missing-config-include-gtk4' into 'master'

Browse Source 
macos: Fix missing gdk symbol exports for gtk dnd

See merge request GNOME/gtk!39
This commit is contained in:
Christoph Reiter 2018-03-01 13:46:26 +00:00
commit 48f68bb881
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/quartz/GdkQuartzNSWindow.c
View File

@ -16,6 +16,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "config.h"
#import "GdkQuartzNSWindow.h" #import "GdkQuartzNSWindow.h"
#include "gdkquartzwindow.h" #include "gdkquartzwindow.h"
#include "gdkdnd-quartz.h" #include "gdkdnd-quartz.h"

1
gdk/quartz/GdkQuartzView.c
View File

@ -17,6 +17,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "config.h"
#import "GdkQuartzView.h" #import "GdkQuartzView.h"
#include "gdkquartzwindow.h" #include "gdkquartzwindow.h"
#include "gdkprivate-quartz.h" #include "gdkprivate-quartz.h"

3
gdk/quartz/gdkdnd-quartz.c
View File

@ -16,6 +16,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "config.h"
#include "gdkdnd.h" #include "gdkdnd.h"
#include "gdkquartzdnd.h" #include "gdkquartzdnd.h"
#include "gdkprivate-quartz.h" #include "gdkprivate-quartz.h"
@ -27,7 +28,7 @@ G_DEFINE_TYPE (GdkQuartzDragContext, gdk_quartz_drag_context, GDK_TYPE_DRAG_CONT
GdkDragContext *_gdk_quartz_drag_source_context = NULL; GdkDragContext *_gdk_quartz_drag_source_context = NULL;
GdkDragContext * GdkDragContext *
gdk_quartz_drag_source_context () gdk_quartz_drag_source_context_libgtk_only ()
{ {
return _gdk_quartz_drag_source_context; return _gdk_quartz_drag_source_context;
} }

3
gdk/quartz/gdkquartzdnd.h
View File

@ -48,6 +48,9 @@ GType gdk_quartz_drag_context_get_type (void);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
id gdk_quartz_drag_context_get_dragging_info_libgtk_only (GdkDragContext *context); id gdk_quartz_drag_context_get_dragging_info_libgtk_only (GdkDragContext *context);
GDK_AVAILABLE_IN_ALL
GdkDragContext *gdk_quartz_drag_source_context_libgtk_only (void);
G_END_DECLS G_END_DECLS
#endif /* __GDK_QUARTZ_DRAG_CONTEXT_H__ */ #endif /* __GDK_QUARTZ_DRAG_CONTEXT_H__ */

6
gtk/gtkdnd-quartz.c
View File

@ -63,8 +63,6 @@ static GtkDragSourceInfo *gtk_drag_get_source_info (GdkDragContext *context,
static void gtk_drag_drop_finished (GtkDragSourceInfo *info, static void gtk_drag_drop_finished (GtkDragSourceInfo *info,
GtkDragResult result); GtkDragResult result);
extern GdkDragContext *gdk_quartz_drag_source_context (); /* gdk/quartz/gdkdnd-quartz.c */
struct _GtkDragSourceInfo struct _GtkDragSourceInfo
{ {
GtkWidget *source_widget; GtkWidget *source_widget;
@ -228,7 +226,7 @@ gtk_drag_finish (GdkDragContext *context,
guint32 time) guint32 time)
{ {
GtkDragSourceInfo *info; GtkDragSourceInfo *info;
GdkDragContext* source_context = gdk_quartz_drag_source_context (); GdkDragContext* source_context = gdk_quartz_drag_source_context_libgtk_only ();
if (source_context) if (source_context)
{ {
@ -310,7 +308,7 @@ GtkWidget *
gtk_drag_get_source_widget (GdkDragContext *context) gtk_drag_get_source_widget (GdkDragContext *context)
{ {
GtkDragSourceInfo *info; GtkDragSourceInfo *info;
GdkDragContext* real_source_context = gdk_quartz_drag_source_context(); GdkDragContext* real_source_context = gdk_quartz_drag_source_context_libgtk_only ();
if (!real_source_context) if (!real_source_context)
return NULL; return NULL;