Don't translate NULL messages. (#161789, Morten Welinder)

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

diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 7d8a402241e65982319a79fa3942f66251fff1c0..ddf3c3c42e94a61ddb4183159335128133305bfc 100644 (file)
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -33,11 +33,13 @@
 #include <gtk/gtkwidget.h>
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 #define GTK_TYPE_ACTION            (gtk_action_get_type ())
 #define GTK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
 #define GTK_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
 #define GTK_IS_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION))
-#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_ACTION))
+#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACTION))
 #define GTK_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_ACTION, GtkActionClass))
 
 typedef struct _GtkAction      GtkAction;
@@ -78,30 +80,48 @@ 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) G_GNUC_CONST;
+GtkAction   *gtk_action_new                    (const gchar *name,
+                                               const gchar *label,
+                                               const gchar *tooltip,
+                                               const gchar *stock_id);
+G_CONST_RETURN gchar* gtk_action_get_name      (GtkAction     *action);
+gboolean     gtk_action_is_sensitive           (GtkAction     *action);
+gboolean     gtk_action_get_sensitive          (GtkAction     *action);
+void         gtk_action_set_sensitive          (GtkAction     *action,
+                                               gboolean       sensitive);
+gboolean     gtk_action_is_visible             (GtkAction     *action);
+gboolean     gtk_action_get_visible            (GtkAction     *action);
+void         gtk_action_set_visible            (GtkAction     *action,
+                                               gboolean       visible);
+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);
+G_CONST_RETURN gchar *gtk_action_get_accel_path (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);
+void         _gtk_action_emit_activate         (GtkAction     *action);
 
 /* 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);
+
 
+G_END_DECLS
 
 #endif  /* __GTK_ACTION_H__ */