Use gtk_text_buffer_get_insert instead of get_mark. Fixes Bug 497164.

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

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 56e8fccb3b418fd65c55703c2be5efe5955e02fe..f0d1e4fcbaa72111a5eac78311e867dcc9572313 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -33,27 +33,31 @@
 
 #include <gtk/gtkwidget.h>
 
+G_BEGIN_DECLS
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+typedef gchar * (*GtkTranslateFunc)       (const gchar         *path,
+                                           gpointer             func_data);
 
+#if !defined (GTK_DISABLE_DEPRECATED)
 
 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
+ * (void) so an explicit cast will be needed.)
+ */
 typedef        void    (*GtkItemFactoryCallback)  ();
 typedef        void    (*GtkItemFactoryCallback1) (gpointer             callback_data,
                                            guint                callback_action,
                                            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;
@@ -80,6 +84,12 @@ struct _GtkItemFactoryClass
   GtkObjectClass        object_class;
 
   GHashTable           *item_ht;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkItemFactoryEntry
@@ -122,16 +132,16 @@ 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);
      
@@ -174,14 +184,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,
@@ -189,9 +199,10 @@ void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
                                            gpointer             data,
                                            GtkDestroyNotify     notify);
 
-#ifndef GTK_DISABLE_DEPRECATED
 /* Compatibility functions for deprecated GtkMenuFactory code
  */
+
+/* Used by gtk_item_factory_create_menu_entries () */
 typedef void (*GtkMenuCallback) (GtkWidget *widget,
                                 gpointer   user_data);
 typedef struct {
@@ -201,25 +212,29 @@ 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 */
 
+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 */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __GTK_ITEM_FACTORY_H__ */
+