From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 2 Nov 2011 02:35:57 +0000 (-0400)
Subject: Don't use *DISABLE_DEPRECATED guards
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=83700521808176a11200a758f5b69c1990a727d4;p=~andy%2Fgtk

Don't use *DISABLE_DEPRECATED guards

Instead define GDK_DISABLE_DEPRECATION_WARNINGS where appropriate.
---

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 906c15822..303f783c3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -48,8 +48,6 @@ AM_CPPFLAGS =						\
 	-I$(top_builddir)/gtk				\
 	-I$(top_srcdir) -I../gdk			\
 	-I$(top_srcdir)/gdk				\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED			\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
 	$(GTK_DEBUG_FLAGS)				\
@@ -1042,8 +1040,6 @@ endif
 Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
 Gtk_3_0_gir_CFLAGS = \
 		$(AM_CPPFLAGS) \
-		-UGDK_DISABLE_DEPRECATED \
-		-UGTK_DISABLE_DEPRECATED \
 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 Gtk_3_0_gir_LIBS = libgtk-3.la
 Gtk_3_0_gir_FILES = $(introspection_files)
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index eb0c93dab..873af183c 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -37,7 +37,6 @@
 
 #include <atk/atk.h>
 
-#undef GTK_DISABLE_DEPRECATED
 #define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include "gtkfontsel.h"
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 4e0cda26b..2c6c1e3be 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -29,7 +29,6 @@
 
 #include <stdlib.h>
 
-#undef GTK_DISABLE_DEPRECATED
 #define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include "gtkhandlebox.h"
diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index 8bb4fba21..2a47deb23 100644
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkhbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index cdfada50b..503fe2458 100644
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -28,7 +28,7 @@
 
 #include "gtkboxprivate.h"
 #include "gtkorientable.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkhbox.h"
 
 
diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index 3ffee8423..ddf2be0ef 100644
--- a/gtk/gtkhpaned.c
+++ b/gtk/gtkhpaned.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkhpaned.h"
 #include "gtkorientable.h"
 
diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index e19a5b6b0..b7f540c5f 100644
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -29,7 +29,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkhscale.h"
 #include "gtkorientable.h"
 
diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c
index 0b0ad6471..62434145d 100644
--- a/gtk/gtkhscrollbar.c
+++ b/gtk/gtkhscrollbar.c
@@ -28,7 +28,7 @@
 #include "config.h"
 
 #include "gtkscrollbar.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkhscrollbar.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c
index 53e99fc0c..4dea4b6d2 100644
--- a/gtk/gtkhseparator.c
+++ b/gtk/gtkhseparator.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkhseparator.h"
 #include "gtkorientable.h"
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index bb327b5d6..dd8d9aad1 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -113,7 +113,6 @@
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtktearoffmenuitem.h"
 
 
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index d21b36302..95a862b9c 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -191,13 +191,6 @@ static void gtk_menu_item_set_related_action         (GtkMenuItem          *menu
 static void gtk_menu_item_set_use_action_appearance  (GtkMenuItem          *menu_item, 
                                                       gboolean              use_appearance);
 
-/* Declare deprecated function that need a declaration */
-#ifdef GTK_DISABLE_DEPRECATED
-void       gtk_menu_item_set_right_justified         (GtkMenuItem          *menu_item,
-                                                      gboolean              right_justified);
-gboolean   gtk_menu_item_get_right_justified         (GtkMenuItem          *menu_item);
-#endif  /* GTK_DISABLE_DEPRECATED */
-
 static guint menu_item_signals[LAST_SIGNAL] = { 0 };
 
 static GtkBuildableIface *parent_buildable_iface;
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 7bda53556..0e613b201 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -53,7 +53,6 @@
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtktearoffmenuitem.h"
 
 #include "a11y/gtkmenushellaccessible.h"
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 91014c46d..689cb268e 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include "gtktable.h"
diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c
index dc151ceed..340062c83 100644
--- a/gtk/gtktearoffmenuitem.c
+++ b/gtk/gtktearoffmenuitem.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "gtkmenuprivate.h"
 #include "gtkmenuitemprivate.h"
 #include "gtktearoffmenuitem.h"
diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c
index 4bcdbbab2..d76faa37f 100644
--- a/gtk/gtktreemenu.c
+++ b/gtk/gtktreemenu.c
@@ -46,7 +46,6 @@
 #include "gtkmenushellprivate.h"
 #include "gtkprivate.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtktearoffmenuitem.h"
 
 /* GObjectClass */
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 6ac647515..1ad9e07f7 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -662,10 +662,6 @@ static void     gtk_tree_view_drag_data_received (GtkWidget        *widget,
                                                   guint             time);
 
 /* tree_model signals */
-static void     gtk_tree_view_set_hadjustment             (GtkTreeView     *tree_view,
-                                                           GtkAdjustment   *adjustment);
-static void     gtk_tree_view_set_vadjustment             (GtkTreeView     *tree_view,
-                                                           GtkAdjustment   *adjustment);
 static gboolean gtk_tree_view_real_move_cursor            (GtkTreeView     *tree_view,
 							   GtkMovementStep  step,
 							   gint             count);
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index b05d53a40..42f00d0cc 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -47,7 +47,6 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkuimanager.h"
 #include "gtktearoffmenuitem.h"
 
diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index f234902ee..5e92f73a6 100644
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkvbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index e3515eb64..514dff3eb 100644
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -28,7 +28,7 @@
 
 #include "gtkboxprivate.h"
 #include "gtkorientable.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkvbox.h"
 #include "gtkboxprivate.h"
 
diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c
index 3cc1825a1..eeb020057 100644
--- a/gtk/gtkvpaned.c
+++ b/gtk/gtkvpaned.c
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include "gtkorientable.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkvpaned.h"
 
 
diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index 45b540c21..e348cfcf2 100644
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -29,7 +29,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkvscale.h"
 #include "gtkorientable.h"
 
diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c
index f8443e37d..402398831 100644
--- a/gtk/gtkvscrollbar.c
+++ b/gtk/gtkvscrollbar.c
@@ -29,7 +29,7 @@
 
 #include "gtkorientable.h"
 #include "gtkscrollbar.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkvscrollbar.h"
 #include "gtkintl.h"
 
diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index 9fb5f92e7..162a62c12 100644
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include "gtkorientable.h"
-#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkvseparator.h"