Install accelerators on actions, not on proxies, support accelerator-only

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

diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 5e6c05bc49feb510259e56148acd1f71dda27b9e..883229836013eeb87aa8bb4b8b07a70f142d1d52 100644 (file)
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -78,31 +78,32 @@ struct _GtkActionClass
   void (*_gtk_reserved4) (void);
 };
 
-GType        gtk_action_get_type              (void);
-const gchar* gtk_action_get_name              (GtkAction   *action);
-void         gtk_action_activate              (GtkAction   *action);
-GtkWidget *  gtk_action_create_icon           (GtkAction   *action,
-                                              GtkIconSize  icon_size);
-GtkWidget *  gtk_action_create_menu_item      (GtkAction   *action);
-GtkWidget *  gtk_action_create_tool_item      (GtkAction   *action);
-void         gtk_action_connect_proxy         (GtkAction   *action,
-                                              GtkWidget   *proxy);
-void         gtk_action_disconnect_proxy      (GtkAction   *action,
-                                              GtkWidget   *proxy);
-GSList    *  gtk_action_get_proxies           (GtkAction   *action);
-
+GType        gtk_action_get_type               (void);
+const gchar* gtk_action_get_name               (GtkAction     *action);
+void         gtk_action_activate               (GtkAction     *action);
+GtkWidget*   gtk_action_create_icon            (GtkAction     *action,
+                                               GtkIconSize    icon_size);
+GtkWidget*   gtk_action_create_menu_item       (GtkAction     *action);
+GtkWidget*   gtk_action_create_tool_item       (GtkAction     *action);
+void         gtk_action_connect_proxy          (GtkAction     *action,
+                                               GtkWidget     *proxy);
+void         gtk_action_disconnect_proxy       (GtkAction     *action,
+                                               GtkWidget     *proxy);
+GSList*      gtk_action_get_proxies            (GtkAction     *action);
+void         gtk_action_connect_accelerator    (GtkAction     *action);
+void         gtk_action_disconnect_accelerator (GtkAction     *action);
 
 /* protected ... for use by child actions */
-void         gtk_action_block_activate_from   (GtkAction   *action,
-                                              GtkWidget   *proxy);
-void         gtk_action_unblock_activate_from (GtkAction   *action,
-                                              GtkWidget   *proxy);
-
+void         gtk_action_block_activate_from    (GtkAction     *action,
+                                               GtkWidget     *proxy);
+void         gtk_action_unblock_activate_from  (GtkAction     *action,
+                                               GtkWidget     *proxy);
 
 /* protected ... for use by action groups */
-void         gtk_action_set_accel_path        (GtkAction   *action,
-                                              const gchar *accel_path);
-
+void         gtk_action_set_accel_path         (GtkAction     *action,
+                                               const gchar   *accel_path);
+void         gtk_action_set_accel_group        (GtkAction     *action,
+                                               GtkAccelGroup *accel_group);
 
 
 #endif  /* __GTK_ACTION_H__ */