Don't use *_DISABLE_DEPRECATED

Instead of undefining the DISABLE_DEPRECATED guards,
define the GDK_DISABLE_DEPRECATION_WARNING macro where needed.
Also replace INCLUDES by AM_CPPFLAGS to shut up automake.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b8494dc56826baf82b40157f438eae772b69d28..cc3b84bbcb17fd67e74e52c9a7c91a52632ba6c1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,12 +3,10 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = css reftests a11y
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \
-       -DGDK_DISABLE_DEPRECATED        \
-       -DGTK_DISABLE_DEPRECATED        \
        $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)               \
        $(GDK_DEP_CFLAGS)
@@ -129,6 +127,9 @@ noinst_PROGRAMS += testerrors
 endif
 
 if HAVE_CXX
+
+AM_CXXFLAGS = $(AM_CPPFLAGS)
+
 noinst_PROGRAMS += autotestkeywords
 TESTS = autotestkeywords
 

diff --git a/tests/testfontselection.c b/tests/testfontselection.c
index a08e23441b412e5d3af29c1fd083a864ce24f707..c02eacc5934c2841a3f902ed142b6e9f06eae071 100644 (file)
--- a/tests/testfontselection.c
+++ b/tests/testfontselection.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include <gtk/gtk.h>

diff --git a/tests/testfontselectiondialog.c b/tests/testfontselectiondialog.c
index 96f8652c7342d46b9d364d5725f5f4bad4170867..9429c54944ac13aafb0ae909dd63610fe3d6eda7 100644 (file)
--- a/tests/testfontselectiondialog.c
+++ b/tests/testfontselectiondialog.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include <gtk/gtk.h>
 

diff --git a/tests/testmerge.c b/tests/testmerge.c
index 0c145837205806e80265e9121c1885fe2558066c..d6e1e566388a995e886c732f09358aee592e3758 100644 (file)
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #endif
 
-#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include <gtk/gtk.h>