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.

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
 

tests/testfontselection.c

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include <gtk/gtk.h>

tests/testfontselectiondialog.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include <gtk/gtk.h>
 

tests/testmerge.c

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #endif
 
-#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include <gtk/gtk.h>