gtk+ r20435 - in trunk: . gtk

[tml svn gnome org]

Author: tml
Date: Tue Jun 17 19:29:22 2008
New Revision: 20435
URL: http://svn.gnome.org/viewvc/gtk+?rev=20435&view=rev

Log:
2008-06-17  Tor Lillqvist  <tml novell com>

	* gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED
	#undef/#define dance here, too, because
	gtk_notebook_set_group_id() is deprecated but used here before it
	is defined, and gcc complains about conflicting type from the
	implicit int declaration when it sees the actual void definition.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtknotebook.c

Modified: trunk/gtk/gtknotebook.c
==============================================================================
--- trunk/gtk/gtknotebook.c	(original)
+++ trunk/gtk/gtknotebook.c	Tue Jun 17 19:29:22 2008
@@ -26,20 +26,27 @@
  */
 
 #include <config.h>
+
+#include <stdio.h>
 #include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtknotebook.h"
 #include "gtkmain.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtklabel.h"
-#include <gdk/gdkkeysyms.h>
-#include <stdio.h>
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkdnd.h"
 #include "gtkbuildable.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define SCROLL_DELAY_FACTOR   5