Deprecate gtk_paned_computed_position(). (#97077)

[~andy/gtk] / gtk / gtkitemfactory.h

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 6dcd7cd3693b869fae7d18fda6bae1303b873617..538a9534708597a33fb00d07402298db11204d9d 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -54,11 +54,11 @@ typedef     void    (*GtkItemFactoryCallback1) (gpointer             callback_data,
                                            GtkWidget           *widget);
 
 #define GTK_TYPE_ITEM_FACTORY            (gtk_item_factory_get_type ())
-#define GTK_ITEM_FACTORY(object)         (GTK_CHECK_CAST ((object), GTK_TYPE_ITEM_FACTORY, GtkItemFactory))
-#define GTK_ITEM_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
-#define GTK_IS_ITEM_FACTORY(object)      (GTK_CHECK_TYPE ((object), GTK_TYPE_ITEM_FACTORY))
-#define GTK_IS_ITEM_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM_FACTORY))
-#define GTK_ITEM_FACTORY_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
+#define GTK_ITEM_FACTORY(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ITEM_FACTORY, GtkItemFactory))
+#define GTK_ITEM_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
+#define GTK_IS_ITEM_FACTORY(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ITEM_FACTORY))
+#define GTK_IS_ITEM_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM_FACTORY))
+#define GTK_ITEM_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
 
 
 typedef        struct  _GtkItemFactory                 GtkItemFactory;
@@ -133,26 +133,28 @@ struct _GtkItemFactoryItem
 };
 
 
-GtkType                gtk_item_factory_get_type           (void) G_GNUC_CONST;
+GType          gtk_item_factory_get_type           (void) G_GNUC_CONST;
 
 /* `container_type' must be of GTK_TYPE_MENU_BAR, GTK_TYPE_MENU,
  * or GTK_TYPE_OPTION_MENU.
  */
-GtkItemFactory*        gtk_item_factory_new       (GtkType              container_type,
+GtkItemFactory*        gtk_item_factory_new       (GType                container_type,
                                            const gchar         *path,
                                            GtkAccelGroup       *accel_group);
 void           gtk_item_factory_construct (GtkItemFactory      *ifactory,
-                                           GtkType              container_type,
+                                           GType                container_type,
                                            const gchar         *path,
                                            GtkAccelGroup       *accel_group);
      
 /* 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);
@@ -185,14 +187,14 @@ void      gtk_item_factory_popup          (GtkItemFactory         *ifactory,
                                         guint                   x,
                                         guint                   y,
                                         guint                   mouse_button,
-                                        guint32                 time);
+                                        guint32                 time_);
 void   gtk_item_factory_popup_with_data(GtkItemFactory         *ifactory,
                                         gpointer                popup_data,
                                         GtkDestroyNotify        destroy,
                                         guint                   x,
                                         guint                   y,
                                         guint                   mouse_button,
-                                        guint32                 time);
+                                        guint32                 time_);
 gpointer gtk_item_factory_popup_data   (GtkItemFactory         *ifactory);
 gpointer gtk_item_factory_popup_data_from_widget (GtkWidget    *widget);
 void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
@@ -200,9 +202,11 @@ void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
                                            gpointer             data,
                                            GtkDestroyNotify     notify);
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 /* Compatibility functions for deprecated GtkMenuFactory code
  */
+
+/* Used by gtk_item_factory_create_menu_entries () */
 typedef void (*GtkMenuCallback) (GtkWidget *widget,
                                 gpointer   user_data);
 typedef struct {
@@ -212,19 +216,26 @@ typedef struct {
   gpointer callback_data;
   GtkWidget *widget;
 } GtkMenuEntry;
-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);
+
+/* Used by gtk_item_factory_callback_marshal () */
 typedef        void    (*GtkItemFactoryCallback2) (GtkWidget           *widget,
                                            gpointer             callback_data,
                                            guint                callback_action);
+
+/* Used by gtk_item_factory_create_items () */
 void   gtk_item_factory_create_items_ac (GtkItemFactory        *ifactory,
                                          guint                  n_entries,
                                          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 */