From 9f7a906801e3ac249695d427f9f536846b6d776a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 28 Jun 2006 16:09:17 +0000 Subject: [PATCH] Cleanups --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkitemfactory.c | 30 +++++++++++++++--------------- gtk/gtkitemfactory.h | 4 ++-- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb564c0b53..0935889160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-28 Matthias Clasen + * gtk/gtkitemfactory.[hc]: Don't unnecessarily use + GTK_COMPILATION. + * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the XKB event details we actually care about. (#346079, Ryan Lortie) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bb564c0b53..0935889160 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-06-28 Matthias Clasen + * gtk/gtkitemfactory.[hc]: Don't unnecessarily use + GTK_COMPILATION. + * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the XKB event details we actually care about. (#346079, Ryan Lortie) diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 9573fd7d6c..98145a9c7f 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -29,20 +29,23 @@ #include +#undef GTK_DISABLE_DEPRECATED #include "gtkitemfactory.h" -#include "gtk/gtkmenubar.h" -#include "gtk/gtkmenu.h" -#include "gtk/gtkmenuitem.h" -#include "gtk/gtkradiomenuitem.h" -#include "gtk/gtkcheckmenuitem.h" -#include "gtk/gtkimagemenuitem.h" -#include "gtk/gtktearoffmenuitem.h" -#include "gtk/gtkaccelmap.h" -#include "gtk/gtkaccellabel.h" +#include "gtkoptionmenu.h" +#define GTK_DISABLE_DEPRECATED +#include "gtkmenubar.h" +#include "gtkmenu.h" +#include "gtkmenuitem.h" +#include "gtkradiomenuitem.h" +#include "gtkcheckmenuitem.h" +#include "gtkimagemenuitem.h" +#include "gtktearoffmenuitem.h" +#include "gtkaccelmap.h" +#include "gtkaccellabel.h" #include "gdk/gdkkeysyms.h" -#include "gtk/gtkimage.h" -#include "gtk/gtkstock.h" -#include "gtk/gtkiconfactory.h" +#include "gtkimage.h" +#include "gtkstock.h" +#include "gtkiconfactory.h" #include "gtkintl.h" #include #include @@ -51,9 +54,6 @@ #endif #include -#undef GTK_DISABLE_DEPRECATED -#include "gtk/gtkoptionmenu.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" /* --- defines --- */ diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index 5cae6892a7..f0d1e4fcba 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -38,7 +38,7 @@ G_BEGIN_DECLS typedef gchar * (*GtkTranslateFunc) (const gchar *path, gpointer func_data); -#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) +#if !defined (GTK_DISABLE_DEPRECATED) typedef void (*GtkPrintFunc) (gpointer func_data, const gchar *str); @@ -231,7 +231,7 @@ void gtk_item_factory_create_menu_entries (guint n_entries, void gtk_item_factories_path_delete (const gchar *ifactory_path, const gchar *path); -#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */ +#endif /* !GTK_DISABLE_DEPRECATED */ G_END_DECLS