gtk+ r20416 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Jun 17 09:58:09 2008
New Revision: 20416
URL: http://svn.gnome.org/viewvc/gtk+?rev=20416&view=rev

Log:
2008-06-17  Michael Natterer  <mitch imendio com>

	* gtk/gtktestutils.c: #undef GTK_DISABLE_DEPRECATED, clean up
	includes a bit.

	* gtk/gtkuimanager.c: #include "gtkwindow.h", it was only pulled
	in via deprecated headers.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtktestutils.c
   trunk/gtk/gtkuimanager.c

Modified: trunk/gtk/gtktestutils.c
==============================================================================
--- trunk/gtk/gtktestutils.c	(original)
+++ trunk/gtk/gtktestutils.c	Tue Jun 17 09:58:09 2008
@@ -20,8 +20,10 @@
 
 /* need to get the prototypes of all get_type functions */
 #define GTK_ENABLE_BROKEN
+#undef GTK_DISABLE_DEPRECATED
+
+#include <config.h>
 
-#include "gtktestutils.h"
 #include <gtk/gtk.h>
 #include "gtkalias.h"
 

Modified: trunk/gtk/gtkuimanager.c
==============================================================================
--- trunk/gtk/gtkuimanager.c	(original)
+++ trunk/gtk/gtkuimanager.c	Tue Jun 17 09:58:09 2008
@@ -43,6 +43,7 @@
 #include "gtktearoffmenuitem.h"
 #include "gtktoolbar.h"
 #include "gtkuimanager.h"
+#include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"