build with GTK_DISABLE_DEPRECATED.

2008-06-17  Michael Natterer  <mitch@imendio.com>

	* gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED.

	* gtk/gtkclist.c
	* gtk/gtkcombo.c
	* gtk/gtkctree.c
	* gtk/gtklist.c
	* gtk/gtklistitem.c
	* gtk/gtkoldeditable.c
	* gtk/gtkpixmap.c
	* gtk/gtktext.c
	* gtk/gtktipsquery.c
	* gtk/gtktree.c
	* gtk/gtktreeitem.c: whenever we #undef GTK_DISABLE_DEPRECATED and
	actually use deprecated symbols (not just types or macros),
	#define it again before #include "gtkalias.h" so the symbols match
	and the beast links.


svn path=/trunk/; revision=20433

13 files changed, 69 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c302e5a80..6299643c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED.
+
+	* gtk/gtkclist.c
+	* gtk/gtkcombo.c
+	* gtk/gtkctree.c
+	* gtk/gtklist.c
+	* gtk/gtklistitem.c
+	* gtk/gtkoldeditable.c
+	* gtk/gtkpixmap.c
+	* gtk/gtktext.c
+	* gtk/gtktipsquery.c
+	* gtk/gtktree.c
+	* gtk/gtktreeitem.c: whenever we #undef GTK_DISABLE_DEPRECATED and
+	actually use deprecated symbols (not just types or macros),
+	#define it again before #include "gtkalias.h" so the symbols match
+	and the beast links.
+
 2008-06-17  Paolo Borelli  <pborelli@katamail.com>
 
 	* gtk/tests/recentmanager.c: more tests for GtkRecentManager.
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a6739f73a1..41cd8ca5fd 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -35,6 +35,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED			\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
 	$(GTK_DEBUG_FLAGS)				\
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 58297816c4..ced0671dce 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -25,14 +25,17 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GDK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-
 #include <config.h>
 
 #include <stdlib.h>
 #include <string.h>
 
+#undef GDK_DISABLE_DEPRECATED
+
+#include <gdk/gdkkeysyms.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkmain.h"
 #include "gtkobject.h"
 #include "gtkctree.h"
@@ -41,7 +44,8 @@
 #include "gtkdnd.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include <gdk/gdkkeysyms.h>
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 /* length of button_actions array */
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 552b738bb6..ed60e5a953 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -33,6 +33,8 @@
 #include <config.h>
 #include <string.h>
 
+#include <gdk/gdkkeysyms.h>
+
 #include "gtkarrow.h"
 #include "gtklabel.h"
 #include "gtklist.h"
@@ -43,11 +45,12 @@
 #include "gtkscrolledwindow.h"
 #include "gtkmain.h"
 #include "gtkwindow.h"
-#include "gdk/gdkkeysyms.h"
 #include "gtkcombo.h"
 #include "gtkframe.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 static const gchar gtk_combo_string_key[] = "gtk-combo-string-value";
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 16d1074103..5df4e0d9a9 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -40,6 +40,8 @@
 #include "gtkdnd.h"
 #include "gtkintl.h"
 #include <gdk/gdkkeysyms.h>
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define PM_SIZE                    8
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index f78b4f3875..e862541d6e 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -36,6 +36,8 @@
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {
diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 000fa960ff..d6e7915b7f 100644
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -24,9 +24,12 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
+
+#include <gdk/gdkkeysyms.h>
+
 #undef GTK_DISABLE_DEPRECATED
 
-#include <config.h>
 #include "gtkbindings.h"
 #include "gtklabel.h"
 #include "gtklistitem.h"
@@ -34,7 +37,8 @@
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
-#include <gdk/gdkkeysyms.h>
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 
diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index 43c66e91b3..840a20107b 100644
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -37,6 +37,8 @@
 #include "gtkselection.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define MIN_EDITABLE_WIDTH  150
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c
index bee47809d2..74ea04de26 100644
--- a/gtk/gtkpixmap.c
+++ b/gtk/gtkpixmap.c
@@ -35,6 +35,8 @@
 #include "gtkcontainer.h"
 #include "gtkpixmap.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index e39279ca56..6bcab8afc0 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -24,14 +24,18 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GDK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-
 #include <config.h>
+
 #include <ctype.h>
 #include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdki18n.h"
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkselection.h"
@@ -43,6 +47,8 @@
 #include "line-arrow.xbm"
 #include "gtkprivate.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 
diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index beef456028..95586e4da7 100644
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -29,13 +29,15 @@
 
 #undef GTK_DISABLE_DEPRECATED
 
-#include	<config.h>
-#include	"gtktipsquery.h"
-#include	"gtksignal.h"
-#include	"gtktooltips.h"
-#include	"gtkmain.h"
-#include        "gtkmarshalers.h"
-#include	"gtkintl.h"
+#include <config.h>
+#include "gtktipsquery.h"
+#include "gtksignal.h"
+#include "gtktooltips.h"
+#include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index a0731de306..d34ce7c019 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -36,6 +36,8 @@
 #include "gtktree.h"
 #include "gtktreeitem.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index b82914e59b..c750404679 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -27,6 +27,7 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
+
 #include "gtklabel.h"
 #include "gtkeventbox.h"
 #include "gtkpixmap.h"
@@ -37,6 +38,8 @@
 #include "gtktree.h"
 #include "gtktreeitem.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #include "tree_plus.xpm"