gtk/gtkfilesel.c gtk/gtkinputdialog.c gtk/gtkmenutoolbutton.c

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

	* gtk/gtkfilesel.c
	* gtk/gtkinputdialog.c
	* gtk/gtkmenutoolbutton.c
	* gtk/gtkoptionmenu.c
	* gtk/gtktoolitem.c
	* gtk/gtktooltips.c: add or move around
	#undef GTK_DISABLE_DEPRECATED so it's possible to build without
	deprecated stuff again (with the minor glitch that it doesn't
	link ;) but at least it's a tool to keep the code clean).


svn path=/trunk/; revision=20426

6 files changed, 28 insertions, 15 deletions

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index adabb6f233..ce6dc27200 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -53,6 +53,9 @@
 #endif /* G_PLATFORM_WIN32 */
 
 #include "gdk/gdkkeysyms.h"
+
+#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */
+
 #include "gtkbutton.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
@@ -75,8 +78,6 @@
 #include "gtkmessagedialog.h"
 #include "gtkdnd.h"
 #include "gtkeventbox.h"
-
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
 
 #define WANT_HPANED 1
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index 48f9c6090c..94010d2985 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -28,13 +28,17 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-
 #include <config.h>
+
 #include <stdlib.h>
+
 #include "gdk/gdkkeysyms.h"
+
+#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */
+
 #include "gtkinputdialog.h"
 #include "gtkbutton.h"
 #include "gtkentry.h"
@@ -45,14 +49,12 @@
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtknotebook.h"
+#include "gtkoptionmenu.h"
 #include "gtkscrolledwindow.h"
 #include "gtkstock.h"
 #include "gtktable.h"
 #include "gtkvbox.h"
 
-#undef GTK_DISABLE_DEPRECATED
-#include "gtkoptionmenu.h"
-
 #include "gtkintl.h"
 #include "gtkalias.h"
 
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index e79b1cd2f6..08b3375072 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -20,8 +20,10 @@
  */
 
 #include <config.h>
+
+#undef GTK_DISABLE_DEPRECATED /* GtkTooltips */
+
 #include "gtkmenutoolbutton.h"
-#include "gtkintl.h"
 #include "gtktogglebutton.h"
 #include "gtkarrow.h"
 #include "gtkhbox.h"
@@ -29,6 +31,7 @@
 #include "gtkmenu.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 328442666d..b0881af09e 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -25,16 +25,17 @@
  */
 
 #include <config.h>
-#include "gtkintl.h"
-#include "gtkmenu.h"
-#include "gtkmenuitem.h"
-#include "gtkmarshalers.h"
+
 #include "gdk/gdkkeysyms.h"
 
 #undef GTK_DISABLE_DEPRECATED
-#include "gtkoptionmenu.h"
 
+#include "gtkmenu.h"
+#include "gtkmenuitem.h"
+#include "gtkmarshalers.h"
+#include "gtkoptionmenu.h"
 #include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define CHILD_LEFT_SPACING        4
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index 48e1f5219e..09cf9369a3 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -21,6 +21,11 @@
  */
 
 #include <config.h>
+
+#include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED /* GtkTooltips */
+
 #include "gtktoolitem.h"
 #include "gtkmarshalers.h"
 #include "gtktoolshell.h"
@@ -30,8 +35,6 @@
 #include "gtkprivate.h"
 #include "gtkalias.h"
 
-#include <string.h>
-
 /**
  * SECTION:gtktoolitem
  * @short_description: The base class of widgets that can be added to #GtkToolShell
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 5767ffa09d..005b546f7a 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -25,10 +25,13 @@
  */
 
 #include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmenuitem.h"