GObject *acceleratable,
guint keyval,
GdkModifierType modifier);
+
+typedef gboolean (*GtkAccelGroupFindFunc) (GtkAccelKey *key,
+ GClosure *closure,
+ gpointer data);
+
struct _GtkAccelGroup
{
GObject parent;
guint n_accels;
GtkAccelGroupEntry *priv_accels;
};
+
struct _GtkAccelGroupClass
{
GObjectClass parent_class;
guint keyval,
GdkModifierType modifier,
GClosure *accel_closure);
+
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
};
+
struct _GtkAccelKey
{
guint accel_key;
/* -- Accelerator Groups --- */
-GType gtk_accel_group_get_type (void);
+GType gtk_accel_group_get_type (void) G_GNUC_CONST;
GtkAccelGroup* gtk_accel_group_new (void);
void gtk_accel_group_lock (GtkAccelGroup *accel_group);
void gtk_accel_group_unlock (GtkAccelGroup *accel_group);
gboolean gtk_accel_group_disconnect_key (GtkAccelGroup *accel_group,
guint accel_key,
GdkModifierType accel_mods);
+gboolean gtk_accel_group_activate (GtkAccelGroup *accel_group,
+ GQuark accel_quark,
+ GObject *acceleratable,
+ guint accel_key,
+ GdkModifierType accel_mods);
/* --- GtkActivatable glue --- */
GObject *object);
void _gtk_accel_group_detach (GtkAccelGroup *accel_group,
GObject *object);
-gboolean gtk_accel_groups_activate (GObject *acceleratable,
+gboolean gtk_accel_groups_activate (GObject *object,
guint accel_key,
GdkModifierType accel_mods);
-GSList* gtk_accel_groups_from_acceleratable (GObject *object);
-GtkAccelKey* gtk_accel_group_find (GtkAccelGroup *accel_group,
- gboolean (*find_func) (GtkAccelKey *key,
- GClosure *closure,
- gpointer data),
- gpointer data);
+GSList* gtk_accel_groups_from_object (GObject *object);
+GtkAccelKey* gtk_accel_group_find (GtkAccelGroup *accel_group,
+ GtkAccelGroupFindFunc find_func,
+ gpointer data);
GtkAccelGroup* gtk_accel_group_from_accel_closure (GClosure *closure);
GdkModifierType *accelerator_mods);
gchar* gtk_accelerator_name (guint accelerator_key,
GdkModifierType accelerator_mods);
+gchar* gtk_accelerator_get_label (guint accelerator_key,
+ GdkModifierType accelerator_mods);
void gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask);
guint gtk_accelerator_get_default_mod_mask (void);