Revert name change

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

diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index 99d0887ff338f91573d1381a336a7a3134629759..208704920bafcb53b2d8be50299d96c6b288765f 100644 (file)
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -16,6 +16,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_ACCEL_MAP_H__
 #define __GTK_ACCEL_MAP_H__
 
@@ -24,34 +29,37 @@
 
 G_BEGIN_DECLS
 
+/* --- global GtkAccelMap object --- */
+#define GTK_TYPE_ACCEL_MAP                (gtk_accel_map_get_type ())
+#define GTK_ACCEL_MAP(accel_map)         (G_TYPE_CHECK_INSTANCE_CAST ((accel_map), GTK_TYPE_ACCEL_MAP, GtkAccelMap))
+#define GTK_ACCEL_MAP_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_MAP, GtkAccelMapClass))
+#define GTK_IS_ACCEL_MAP(accel_map)      (G_TYPE_CHECK_INSTANCE_TYPE ((accel_map), GTK_TYPE_ACCEL_MAP))
+#define GTK_IS_ACCEL_MAP_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_MAP))
+#define GTK_ACCEL_MAP_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_MAP, GtkAccelMapClass))
+
+typedef struct _GtkAccelMap      GtkAccelMap;
+typedef struct _GtkAccelMapClass GtkAccelMapClass;
 
 /* --- notifier --- */
-typedef void (*GtkAccelMapNotify)              (gpointer        data,
-                                                GQuark          accel_path_quark,
-                                                guint           accel_key,
-                                                guint           accel_mods,
-                                                GtkAccelGroup  *accel_group,
-                                                guint           old_accel_key,
-                                                guint           old_accel_mods);
 typedef void (*GtkAccelMapForeach)             (gpointer        data,
                                                 const gchar    *accel_path,
                                                 guint           accel_key,
-                                                guint           accel_mods,
+                                                GdkModifierType accel_mods,
                                                 gboolean        changed);
 
 
 /* --- public API --- */
-GQuark    gtk_accel_map_add_entry      (const gchar            *accel_path,
+
+#ifdef G_OS_WIN32
+/* Reserve old names for DLL ABI backward compatibility */
+#define gtk_accel_map_load gtk_accel_map_load_utf8
+#define gtk_accel_map_save gtk_accel_map_save_utf8
+#endif
+
+void      gtk_accel_map_add_entry      (const gchar            *accel_path,
                                         guint                   accel_key,
-                                        guint                   accel_mods);
-void      gtk_accel_map_add_notifer    (const gchar            *accel_path,
-                                        gpointer                notify_data,
-                                        GtkAccelMapNotify       notify_func,
-                                        GtkAccelGroup          *accel_group);
-void      gtk_accel_map_remove_notifer (const gchar            *accel_path,
-                                        gpointer                notify_data,
-                                        GtkAccelMapNotify       notify_func);
-GQuark     gtk_accel_map_lookup_entry  (const gchar            *accel_path,
+                                        GdkModifierType         accel_mods);
+gboolean   gtk_accel_map_lookup_entry  (const gchar            *accel_path,
                                         GtkAccelKey            *key);
 gboolean   gtk_accel_map_change_entry  (const gchar            *accel_path,
                                         guint                   accel_key,
@@ -65,16 +73,28 @@ void           gtk_accel_map_load_fd        (gint                    fd);
 void      gtk_accel_map_load_scanner   (GScanner               *scanner);
 void      gtk_accel_map_save_fd        (gint                    fd);
 
+void       gtk_accel_map_lock_path      (const gchar            *accel_path);
+void       gtk_accel_map_unlock_path    (const gchar            *accel_path);
 
 /* --- filter functions --- */
-void   gtk_accel_map_add_filter        (const gchar            *filter_pattern);
-void   gtk_accel_map_foreach_unfilterd (gpointer                data,
-                                        GtkAccelMapForeach      foreach_func);
+void   gtk_accel_map_add_filter         (const gchar           *filter_pattern);
+void   gtk_accel_map_foreach_unfiltered (gpointer               data,
+                                         GtkAccelMapForeach     foreach_func);
+
+/* --- notification --- */
+GType        gtk_accel_map_get_type (void) G_GNUC_CONST;
+GtkAccelMap *gtk_accel_map_get      (void);
 
 
 /* --- internal API --- */
 void           _gtk_accel_map_init             (void);
 
+void            _gtk_accel_map_add_group        (const gchar   *accel_path,
+                                                 GtkAccelGroup *accel_group);
+void            _gtk_accel_map_remove_group     (const gchar   *accel_path,
+                                                 GtkAccelGroup *accel_group);
+gboolean       _gtk_accel_path_is_valid         (const gchar   *accel_path);
+
 
 G_END_DECLS