diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/gtkitemfactory.h | 15 |
6 files changed, 27 insertions, 8 deletions
@@ -1,5 +1,9 @@ 2003-09-27 Matthias Clasen <maclas@gmx.de> + * gtk/gtkitemfactory.h: Deprecate GtkItemFactory in favor + of GtkUIManager. Just leave GtkTranslateFunc undeprecated, + since GtkActionGroup uses it. + * tests/testtext.c: Turn off GTK_DISABLE_DEPRECATED, since this test uses the soon-to-be-deprecated GtkItemFactory. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index eb3426bae..ebdff27a0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2003-09-27 Matthias Clasen <maclas@gmx.de> + * gtk/gtkitemfactory.h: Deprecate GtkItemFactory in favor + of GtkUIManager. Just leave GtkTranslateFunc undeprecated, + since GtkActionGroup uses it. + * tests/testtext.c: Turn off GTK_DISABLE_DEPRECATED, since this test uses the soon-to-be-deprecated GtkItemFactory. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index eb3426bae..ebdff27a0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ 2003-09-27 Matthias Clasen <maclas@gmx.de> + * gtk/gtkitemfactory.h: Deprecate GtkItemFactory in favor + of GtkUIManager. Just leave GtkTranslateFunc undeprecated, + since GtkActionGroup uses it. + * tests/testtext.c: Turn off GTK_DISABLE_DEPRECATED, since this test uses the soon-to-be-deprecated GtkItemFactory. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index eb3426bae..ebdff27a0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2003-09-27 Matthias Clasen <maclas@gmx.de> + * gtk/gtkitemfactory.h: Deprecate GtkItemFactory in favor + of GtkUIManager. Just leave GtkTranslateFunc undeprecated, + since GtkActionGroup uses it. + * tests/testtext.c: Turn off GTK_DISABLE_DEPRECATED, since this test uses the soon-to-be-deprecated GtkItemFactory. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index eb3426bae..ebdff27a0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2003-09-27 Matthias Clasen <maclas@gmx.de> + * gtk/gtkitemfactory.h: Deprecate GtkItemFactory in favor + of GtkUIManager. Just leave GtkTranslateFunc undeprecated, + since GtkActionGroup uses it. + * tests/testtext.c: Turn off GTK_DISABLE_DEPRECATED, since this test uses the soon-to-be-deprecated GtkItemFactory. diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index 538a95347..9d13df470 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -38,11 +38,13 @@ extern "C" { #endif /* __cplusplus */ +typedef gchar * (*GtkTranslateFunc) (const gchar *path, + gpointer func_data); + +#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) typedef void (*GtkPrintFunc) (gpointer func_data, const gchar *str); -typedef gchar * (*GtkTranslateFunc) (const gchar *path, - gpointer func_data); /* We use () here to mean unspecified arguments. This is deprecated * as of C99, but we can't change it without breaking compatibility. * (Note that if we are included from a C++ program () will mean @@ -148,13 +150,11 @@ void gtk_item_factory_construct (GtkItemFactory *ifactory, /* These functions operate on GtkItemFactoryClass basis. */ -#ifndef GTK_DISABLE_DEPRECATED void gtk_item_factory_add_foreign (GtkWidget *accel_widget, const gchar *full_path, GtkAccelGroup *accel_group, guint keyval, GdkModifierType modifiers); -#endif GtkItemFactory* gtk_item_factory_from_widget (GtkWidget *widget); G_CONST_RETURN gchar* gtk_item_factory_path_from_widget (GtkWidget *widget); @@ -202,7 +202,6 @@ void gtk_item_factory_set_translate_func (GtkItemFactory *ifactory, gpointer data, GtkDestroyNotify notify); -#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) /* Compatibility functions for deprecated GtkMenuFactory code */ @@ -228,15 +227,14 @@ void gtk_item_factory_create_items_ac (GtkItemFactory *ifactory, GtkItemFactoryEntry *entries, gpointer callback_data, guint callback_type); -#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */ -#ifndef GTK_DISABLE_DEPRECATED GtkItemFactory* gtk_item_factory_from_path (const gchar *path); void gtk_item_factory_create_menu_entries (guint n_entries, GtkMenuEntry *entries); void gtk_item_factories_path_delete (const gchar *ifactory_path, const gchar *path); -#endif /* GTK_DISABLE_DEPRECATED */ + +#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */ #ifdef __cplusplus @@ -245,3 +243,4 @@ void gtk_item_factories_path_delete (const gchar *ifactory_path, #endif /* __GTK_ITEM_FACTORY_H__ */ + |