AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
Matthias Clasen 2006-06-28 16:09:17 +00:00
parent 03de4627d3
commit 9f7a906801
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-06-28 Matthias Clasen <mclasen@redhat.com> 2006-06-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkitemfactory.[hc]: Don't unnecessarily use
GTK_COMPILATION.
* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the
XKB event details we actually care about. (#346079, Ryan Lortie) XKB event details we actually care about. (#346079, Ryan Lortie)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-06-28 Matthias Clasen <mclasen@redhat.com> 2006-06-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkitemfactory.[hc]: Don't unnecessarily use
GTK_COMPILATION.
* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the
XKB event details we actually care about. (#346079, Ryan Lortie) XKB event details we actually care about. (#346079, Ryan Lortie)

30
gtk/gtkitemfactory.c
View File

@ -29,20 +29,23 @@
#include <config.h> #include <config.h>
#undef GTK_DISABLE_DEPRECATED
#include "gtkitemfactory.h" #include "gtkitemfactory.h"
#include "gtk/gtkmenubar.h" #include "gtkoptionmenu.h"
#include "gtk/gtkmenu.h" #define GTK_DISABLE_DEPRECATED
#include "gtk/gtkmenuitem.h" #include "gtkmenubar.h"
#include "gtk/gtkradiomenuitem.h" #include "gtkmenu.h"
#include "gtk/gtkcheckmenuitem.h" #include "gtkmenuitem.h"
#include "gtk/gtkimagemenuitem.h" #include "gtkradiomenuitem.h"
#include "gtk/gtktearoffmenuitem.h" #include "gtkcheckmenuitem.h"
#include "gtk/gtkaccelmap.h" #include "gtkimagemenuitem.h"
#include "gtk/gtkaccellabel.h" #include "gtktearoffmenuitem.h"
#include "gtkaccelmap.h"
#include "gtkaccellabel.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtk/gtkimage.h" #include "gtkimage.h"
#include "gtk/gtkstock.h" #include "gtkstock.h"
#include "gtk/gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
@ -51,9 +54,6 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#undef GTK_DISABLE_DEPRECATED
#include "gtk/gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkalias.h" #include "gtkalias.h"
/* --- defines --- */ /* --- defines --- */

4
gtk/gtkitemfactory.h
View File

@ -38,7 +38,7 @@ G_BEGIN_DECLS
typedef gchar * (*GtkTranslateFunc) (const gchar *path, typedef gchar * (*GtkTranslateFunc) (const gchar *path,
gpointer func_data); gpointer func_data);
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) #if !defined (GTK_DISABLE_DEPRECATED)
typedef void (*GtkPrintFunc) (gpointer func_data, typedef void (*GtkPrintFunc) (gpointer func_data,
const gchar *str); 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, void gtk_item_factories_path_delete (const gchar *ifactory_path,
const gchar *path); const gchar *path);
#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */ #endif /* !GTK_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS