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

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 8b8494dc5..cc3b84bbc 100644
--- 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 a08e23441..c02eacc59 100644
--- 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 96f8652c7..9429c5494 100644
--- 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 0c1458372..d6e1e5663 100644
--- 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>