gtk+ r20433 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Jun 17 16:03:46 2008
New Revision: 20433
URL: http://svn.gnome.org/viewvc/gtk+?rev=20433&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/Makefile.am
   trunk/gtk/gtkclist.c
   trunk/gtk/gtkcombo.c
   trunk/gtk/gtkctree.c
   trunk/gtk/gtklist.c
   trunk/gtk/gtklistitem.c
   trunk/gtk/gtkoldeditable.c
   trunk/gtk/gtkpixmap.c
   trunk/gtk/gtktext.c
   trunk/gtk/gtktipsquery.c
   trunk/gtk/gtktree.c
   trunk/gtk/gtktreeitem.c

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Tue Jun 17 16:03:46 2008
@@ -35,6 +35,7 @@
 	-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)				\

Modified: trunk/gtk/gtkclist.c
==============================================================================
--- trunk/gtk/gtkclist.c	(original)
+++ trunk/gtk/gtkclist.c	Tue Jun 17 16:03:46 2008
@@ -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 */

Modified: trunk/gtk/gtkcombo.c
==============================================================================
--- trunk/gtk/gtkcombo.c	(original)
+++ trunk/gtk/gtkcombo.c	Tue Jun 17 16:03:46 2008
@@ -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";

Modified: trunk/gtk/gtkctree.c
==============================================================================
--- trunk/gtk/gtkctree.c	(original)
+++ trunk/gtk/gtkctree.c	Tue Jun 17 16:03:46 2008
@@ -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

Modified: trunk/gtk/gtklist.c
==============================================================================
--- trunk/gtk/gtklist.c	(original)
+++ trunk/gtk/gtklist.c	Tue Jun 17 16:03:46 2008
@@ -36,6 +36,8 @@
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {

Modified: trunk/gtk/gtklistitem.c
==============================================================================
--- trunk/gtk/gtklistitem.c	(original)
+++ trunk/gtk/gtklistitem.c	Tue Jun 17 16:03:46 2008
@@ -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"
 
 

Modified: trunk/gtk/gtkoldeditable.c
==============================================================================
--- trunk/gtk/gtkoldeditable.c	(original)
+++ trunk/gtk/gtkoldeditable.c	Tue Jun 17 16:03:46 2008
@@ -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

Modified: trunk/gtk/gtkpixmap.c
==============================================================================
--- trunk/gtk/gtkpixmap.c	(original)
+++ trunk/gtk/gtkpixmap.c	Tue Jun 17 16:03:46 2008
@@ -35,6 +35,8 @@
 #include "gtkcontainer.h"
 #include "gtkpixmap.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

Modified: trunk/gtk/gtktext.c
==============================================================================
--- trunk/gtk/gtktext.c	(original)
+++ trunk/gtk/gtktext.c	Tue Jun 17 16:03:46 2008
@@ -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"
 
 

Modified: trunk/gtk/gtktipsquery.c
==============================================================================
--- trunk/gtk/gtktipsquery.c	(original)
+++ trunk/gtk/gtktipsquery.c	Tue Jun 17 16:03:46 2008
@@ -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"
 
 

Modified: trunk/gtk/gtktree.c
==============================================================================
--- trunk/gtk/gtktree.c	(original)
+++ trunk/gtk/gtktree.c	Tue Jun 17 16:03:46 2008
@@ -36,6 +36,8 @@
 #include "gtktree.h"
 #include "gtktreeitem.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {

Modified: trunk/gtk/gtktreeitem.c
==============================================================================
--- trunk/gtk/gtktreeitem.c	(original)
+++ trunk/gtk/gtktreeitem.c	Tue Jun 17 16:03:46 2008
@@ -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"