summaryrefslogtreecommitdiff
path: root/gtk/gtkitemfactory.h
diff options
context:
space:
mode:
authorMatthias Clasen <maclas@gmx.de>2003-09-26 23:59:42 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2003-09-26 23:59:42 +0000
commit08573c0879e769314ce20e535859717987cc532b (patch)
treeb93fa8b34aebf0ce101e6693438e0e9e61210c6b /gtk/gtkitemfactory.h
parente4507b60182ee3c69fbc8df06169eefb914a621a (diff)
downloadgtk+-08573c0879e769314ce20e535859717987cc532b.tar.gz
Deprecate GtkItemFactory in favor of GtkUIManager. Just leave
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.
Diffstat (limited to 'gtk/gtkitemfactory.h')
-rw-r--r--gtk/gtkitemfactory.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 538a953470..9d13df4707 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__ */
+