[gtk/gtk-3-22: 2/3] macos: export gdk_quartz_drag_source_context()



commit 342aee304ace1e2161ea7d5cc415d88395adbc34
Author: Christoph Reiter <creiter src gnome org>
Date:   Thu Mar 1 14:31:57 2018 +0100

    macos: export gdk_quartz_drag_source_context()
    
    It's used in the gtk dnd code but not exported in gdk.
    Append a "_libgtk_only" suffix as with other internal exports and
    export the symbol.
    
    See #32

 gdk/quartz/gdkdnd-quartz.c | 2 +-
 gdk/quartz/gdkquartzdnd.h  | 3 +++
 gtk/gtkdnd-quartz.c        | 6 ++----
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c
index b9928acd44..aca4cb1dd8 100644
--- a/gdk/quartz/gdkdnd-quartz.c
+++ b/gdk/quartz/gdkdnd-quartz.c
@@ -28,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 ()
+gdk_quartz_drag_source_context_libgtk_only ()
 {
   return _gdk_quartz_drag_source_context;
 }
diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h
index 1fb4131754..fb578e1b8f 100644
--- a/gdk/quartz/gdkquartzdnd.h
+++ b/gdk/quartz/gdkquartzdnd.h
@@ -48,6 +48,9 @@ GType     gdk_quartz_drag_context_get_type (void);
 GDK_AVAILABLE_IN_ALL
 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
 
 #endif /* __GDK_QUARTZ_DRAG_CONTEXT_H__ */
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 6198986f6d..f9d70e455c 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -65,8 +65,6 @@ static GtkDragSourceInfo *gtk_drag_get_source_info (GdkDragContext *context,
 static void gtk_drag_drop_finished (GtkDragSourceInfo *info,
                                    GtkDragResult      result);
 
-extern GdkDragContext *gdk_quartz_drag_source_context (); /* gdk/quartz/gdkdnd-quartz.c */
-
 struct _GtkDragSourceInfo 
 {
   GtkWidget         *source_widget;
@@ -233,7 +231,7 @@ gtk_drag_finish (GdkDragContext *context,
                 guint32         time)
 {
   GtkDragSourceInfo *info;
-  GdkDragContext* source_context = gdk_quartz_drag_source_context ();
+  GdkDragContext* source_context = gdk_quartz_drag_source_context_libgtk_only ();
 
   if (source_context)
     {
@@ -315,7 +313,7 @@ GtkWidget *
 gtk_drag_get_source_widget (GdkDragContext *context)
 {
   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)
     return NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]