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

diff --git a/ChangeLog b/ChangeLog
index 31a72acda3ae7779e36e28dbdbb085b757378f17..787754894ff7430ede33d3bd7a59b9e7117c834b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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).
+
 2008-06-17  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentmanager.c:

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index adabb6f233d23f1bb1095bcfb9e3f6f932e95ea6..ce6dc2720038d43eb7c41e76fb51d0ba8b6aa979 100644 (file)
--- 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 48f9c6090c0cd90d755da5300894552bb3627717..94010d298551a8e3dfd68a8cca6d389bcd662a45 100644 (file)
--- 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 e79b1cd2f687620856c0e22c096446336e4fb56a..08b33750721e0fb5b8d8b027242459b200140af0 100644 (file)
--- 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 328442666d19b13e21173c7af983ed5a14f08a05..b0881af09e1a8a614721c41d211736f3c5769f83 100644 (file)
--- 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 48e1f5219e7a828b1c9444c8a070893404fa0b4c..09cf9369a3d36adcadef89cfbe9587fe373b6b64 100644 (file)
--- 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 5767ffa09df6217282bbeef61855f772e346d6fa..005b546f7ae349cb134a1fca3d205f1f11c8ecf6 100644 (file)
--- 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"