From 8c46ef830b42e701c72264071e78ac93a13774b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 9 Oct 2009 17:27:03 +0200 Subject: [PATCH] Remove deprecated code from GdkDnd --- docs/reference/gdk/gdk-sections.txt | 2 -- docs/reference/gdk/tmpl/dnd.sgml | 14 ------------- gdk/directfb/gdkdnd-directfb.c | 12 ----------- gdk/gdk.symbols | 4 ---- gdk/gdkdnd.h | 5 ----- gdk/quartz/gdkdnd-quartz.c | 12 ----------- gdk/win32/gdkdnd-win32.c | 16 --------------- gdk/x11/gdkdnd-x11.c | 32 ----------------------------- 8 files changed, 97 deletions(-) diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index 432d8e7fd6..3148da685c 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -1224,14 +1224,12 @@ gdk_drag_context_new gdk_drag_drop gdk_drag_find_window gdk_drag_find_window_for_screen -gdk_drag_context_ref gdk_drag_begin gdk_drag_motion gdk_drop_finish gdk_drag_get_protocol gdk_drag_get_protocol_for_display GdkDragProtocol -gdk_drag_context_unref GdkDragContext GdkDragAction gdk_drag_status diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml index b3c360d6e6..3d1b521c7c 100644 --- a/docs/reference/gdk/tmpl/dnd.sgml +++ b/docs/reference/gdk/tmpl/dnd.sgml @@ -91,13 +91,6 @@ the GTK+ documentation for more information. @protocol: - - - - -@context: - - @@ -166,13 +159,6 @@ which DND is done. @GDK_DRAG_PROTO_OLE2: The complex OLE2 DND protocol (not implemented). @GDK_DRAG_PROTO_LOCAL: Intra-application DND. - - - - -@context: - - A GdkDragContext holds information about a diff --git a/gdk/directfb/gdkdnd-directfb.c b/gdk/directfb/gdkdnd-directfb.c index 35624c7af5..527a817c0d 100644 --- a/gdk/directfb/gdkdnd-directfb.c +++ b/gdk/directfb/gdkdnd-directfb.c @@ -121,18 +121,6 @@ gdk_drag_context_new (void) return g_object_new (gdk_drag_context_get_type (), NULL); } -void -gdk_drag_context_ref (GdkDragContext *context) -{ - g_object_ref (context); -} - -void -gdk_drag_context_unref (GdkDragContext *context) -{ - g_object_unref (context); -} - static GdkDragContext * gdk_drag_context_find (gboolean is_source, GdkWindow *source, diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index a38d3a5238..9363766354 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -511,10 +511,6 @@ gdk_drag_abort gdk_drag_begin gdk_drag_context_get_type G_GNUC_CONST gdk_drag_context_new -#ifndef GDK_DISABLE_DEPRECATED -gdk_drag_context_ref -gdk_drag_context_unref -#endif gdk_drag_drop gdk_drag_drop_succeeded gdk_drag_find_window_for_screen diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index b9f83352f5..beada1d807 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -107,11 +107,6 @@ struct _GdkDragContextClass { GType gdk_drag_context_get_type (void) G_GNUC_CONST; GdkDragContext * gdk_drag_context_new (void); -#ifndef GDK_DISABLE_DEPRECATED -void gdk_drag_context_ref (GdkDragContext *context); -void gdk_drag_context_unref (GdkDragContext *context); -#endif - /* Destination side */ void gdk_drag_status (GdkDragContext *context, diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c index bb70b710fc..2292d1fbb1 100644 --- a/gdk/quartz/gdkdnd-quartz.c +++ b/gdk/quartz/gdkdnd-quartz.c @@ -87,18 +87,6 @@ gdk_drag_context_new (void) return (GdkDragContext *)g_object_new (gdk_drag_context_get_type (), NULL); } -void -gdk_drag_context_ref (GdkDragContext *context) -{ - g_object_ref (context); -} - -void -gdk_drag_context_unref (GdkDragContext *context) -{ - g_object_unref (context); -} - GdkDragContext *_gdk_quartz_drag_source_context = NULL; GdkDragContext * diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index 9f4d37ba4c..472ff69cd1 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -203,22 +203,6 @@ gdk_drag_context_new (void) return g_object_new (GDK_TYPE_DRAG_CONTEXT, NULL); } -void -gdk_drag_context_ref (GdkDragContext *context) -{ - g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); - - g_object_ref (context); -} - -void -gdk_drag_context_unref (GdkDragContext *context) -{ - g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); - - g_object_unref (context); -} - static GdkDragContext * gdk_drag_context_find (gboolean is_source, GdkWindow *source, diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 4b7fd85149..631dbed477 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -220,38 +220,6 @@ gdk_drag_context_new (void) return g_object_new (GDK_TYPE_DRAG_CONTEXT, NULL); } -/** - * gdk_drag_context_ref: - * @context: a #GdkDragContext. - * - * Deprecated function; use g_object_ref() instead. - * - * Deprecated: 2.2: Use g_object_ref() instead. - **/ -void -gdk_drag_context_ref (GdkDragContext *context) -{ - g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); - - g_object_ref (context); -} - -/** - * gdk_drag_context_unref: - * @context: a #GdkDragContext. - * - * Deprecated function; use g_object_unref() instead. - * - * Deprecated: 2.2: Use g_object_unref() instead. - **/ -void -gdk_drag_context_unref (GdkDragContext *context) -{ - g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); - - g_object_unref (context); -} - static GdkDragContext * gdk_drag_context_find (GdkDisplay *display, gboolean is_source,