From d6ebf18108dc1b52d9a7a66d2489a3f4e1c538a0 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 17 Jun 2008 14:11:26 +0000 Subject: [PATCH] gtk/gtkfilesel.c gtk/gtkinputdialog.c gtk/gtkmenutoolbutton.c 2008-06-17 Michael Natterer * 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 --- ChangeLog | 12 ++++++++++++ gtk/gtkfilesel.c | 5 +++-- gtk/gtkinputdialog.c | 12 +++++++----- gtk/gtkmenutoolbutton.c | 5 ++++- gtk/gtkoptionmenu.c | 11 ++++++----- gtk/gtktoolitem.c | 7 +++++-- gtk/gtktooltips.c | 3 +++ 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31a72acda..787754894 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-06-17 Michael Natterer + + * 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 * gtk/gtkrecentmanager.c: diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index adabb6f23..ce6dc2720 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 48f9c6090..94010d298 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 + #include + #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 e79b1cd2f..08b337507 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -20,8 +20,10 @@ */ #include + +#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 328442666..b0881af09 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -25,16 +25,17 @@ */ #include -#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 48e1f5219..09cf9369a 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -21,6 +21,11 @@ */ #include + +#include + +#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 - /** * 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 5767ffa09..005b546f7 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -25,10 +25,13 @@ */ #include + #include #include #include +#undef GTK_DISABLE_DEPRECATED + #include "gtklabel.h" #include "gtkmain.h" #include "gtkmenuitem.h" -- 2.43.2