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 906c158221aa0aadbfb8ec0d3c4a542ed4e34bf8..303f783c315bfa88c8d842a6dd8f62cdaa0eb68b 100644 (file)
--- 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 eb0c93dabb0775be7578e5a77d01b448919b00e9..873af183c0a7168b082071e9e6a70da1c9ca5f83 100644 (file)
--- 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 4e0cda26b2315dc449c3ee598217c574cc42e754..2c6c1e3be3f8ac6d354985328555f1884050b408 100644 (file)
--- 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 8bb4fba21d67a9872f84f9871d8cf66923a5afb0..2a47deb23d1b6ceb3dd649fcafefe418434832ac 100644 (file)
--- 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 cdfada50b49d6490bf4db87a1e1ccd6b3dd7f7cd..503fe2458b929b30ec7bc17615e96f323b1b0c4c 100644 (file)
--- 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 3ffee8423fbdb68afd155b777b1ca32bbc1c618d..ddf2be0ef847be3405ef8860ec28a09f03ce9f9f 100644 (file)
--- 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 e19a5b6b043330b2650579942726d00c0fa420b2..b7f540c5f0579d86a13b52938dd944a42253d8f6 100644 (file)
--- 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 0b0ad64718164bf046e4ef8ab2f59ed25f1eb2e7..62434145db281a74ba4a228284215d6885ec3ff0 100644 (file)
--- 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 53e99fc0cf50b0e8666b5024bc538b3941b6ecbe..4dea4b6d256d37dbf87b2b86a4e66736d72c5a6c 100644 (file)
--- 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 bb327b5d6603ec3e2daf08c9963a55eb380a898c..dd8d9aad17c38e43c4ef736d0b534aa5082416a2 100644 (file)
--- 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 d21b36302810dc1369b300137f9f33084b433a08..95a862b9c50a76c8118df9eb1e7cf1b2926754ba 100644 (file)
--- 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 7bda5355616619726f1e1ecc0b55fcfe198ed9d7..0e613b20102995ddd271cf516e04b949d93d252a 100644 (file)
--- 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 91014c46ddc727ddceb95279c564135c57632a10..689cb268ea61ecaabee02478ce68637b546e4b62 100644 (file)
--- 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 dc151ceed77918ecce73780bc09fb231c34da454..340062c83a14dd7bffd13858b6858fd3b5e23ea1 100644 (file)
--- 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 4bcdbbab2b966e931bfc54db68d888569a60a922..d76faa37f0672950a6dad0efd325ac5f4c8c3243 100644 (file)
--- 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 6ac647515ff4173279890a988fd9d7fefb129a3b..1ad9e07f72aacb1d19a40aaa5b4eb2bc473c51fe 100644 (file)
--- 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 b05d53a40c7aac6935f29aa1a0a6fea0dfd46057..42f00d0cc25e14f9e34bde9b0ad722cbc66c28e1 100644 (file)
--- 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 f234902ee142705a2107c9b54af2dc27810e1c24..5e92f73a6cc0cac3e5ba63987d0fb4e5a905b198 100644 (file)
--- 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 e3515eb643ff75ee9b9849a9d86b0b9efe54d191..514dff3eb58f6999443c8a7b3758a5c328509b67 100644 (file)
--- 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 3cc1825a155b1c1008313674e61e778716e85b1e..eeb02005728bc7e76eb636bcbf6c7733b8136b6c 100644 (file)
--- 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 45b540c2123dc1c7cae68c5e756f0c28134937fe..e348cfcf2089b0bc5984085edbeae3e113d7af0a 100644 (file)
--- 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 f8443e37d1f30bf1c961e95cbd2b903ec86daf4d..402398831b3ee96c0aa855cdb4c6db0f6aedb8e7 100644 (file)
--- 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 9fb5f92e77efb7594df67acdad6243b0cc6ac586..162a62c127bb53a66e6fc5e6adcc363e0944a446 100644 (file)
--- 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"