Finish making the GtkSettings object identical on all backends so that it doesn't...

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

diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 4cc5d93b1b5778b45df445050e749634bee199c5..c1212f2fd1c8bc399a2988dc41ed919224811a21 100644 (file)
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -28,7 +28,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -36,7 +36,6 @@
 #define __GTK_ACTION_H__
 
 #include <gtk/gtkwidget.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 
@@ -56,7 +55,6 @@ struct _GtkAction
   GObject object;
 
   /*< private >*/
-
   GtkActionPrivate *private_data;
 };
 
@@ -81,6 +79,7 @@ struct _GtkActionClass
   GtkWidget *(* create_menu)        (GtkAction *action);
 
   /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
@@ -106,22 +105,21 @@ GtkWidget *  gtk_action_create_icon            (GtkAction     *action,
 GtkWidget *  gtk_action_create_menu_item       (GtkAction     *action);
 GtkWidget *  gtk_action_create_tool_item       (GtkAction     *action);
 GtkWidget *  gtk_action_create_menu            (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);
-GtkAction *  gtk_widget_get_action             (GtkWidget     *widget);
 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);
 GClosure    *gtk_action_get_accel_closure      (GtkAction     *action);
+void         gtk_action_block_activate         (GtkAction     *action);
+void         gtk_action_unblock_activate       (GtkAction     *action);
 
-/* protected ... for use by child actions */
-void         gtk_action_block_activate_from    (GtkAction     *action,
+
+void         _gtk_action_add_to_proxy_list     (GtkAction     *action,
                                                GtkWidget     *proxy);
-void         gtk_action_unblock_activate_from  (GtkAction     *action,
+void         _gtk_action_remove_from_proxy_list(GtkAction     *action,
                                                GtkWidget     *proxy);
+
+/* protected ... for use by child actions */
 void         _gtk_action_emit_activate         (GtkAction     *action);
 
 /* protected ... for use by action groups */
@@ -129,12 +127,42 @@ void         gtk_action_set_accel_path         (GtkAction     *action,
                                                const gchar   *accel_path);
 void         gtk_action_set_accel_group        (GtkAction     *action,
                                                GtkAccelGroup *accel_group);
-void         _gtk_action_sync_sensitive        (GtkAction     *action);
-void         _gtk_action_sync_visible          (GtkAction     *action);
 void         _gtk_action_sync_menu_visible     (GtkAction     *action,
                                                GtkWidget     *proxy,
                                                gboolean       empty);
 
+void                  gtk_action_set_label              (GtkAction   *action,
+                                                         const gchar *label);
+G_CONST_RETURN gchar *gtk_action_get_label              (GtkAction   *action);
+void                  gtk_action_set_short_label        (GtkAction   *action,
+                                                         const gchar *short_label);
+G_CONST_RETURN gchar *gtk_action_get_short_label        (GtkAction   *action);
+void                  gtk_action_set_tooltip            (GtkAction   *action,
+                                                         const gchar *tooltip);
+G_CONST_RETURN gchar *gtk_action_get_tooltip            (GtkAction   *action);
+void                  gtk_action_set_stock_id           (GtkAction   *action,
+                                                         const gchar *stock_id);
+G_CONST_RETURN gchar *gtk_action_get_stock_id           (GtkAction   *action);
+void                  gtk_action_set_gicon              (GtkAction   *action,
+                                                         GIcon       *icon);
+GIcon                *gtk_action_get_gicon              (GtkAction   *action);
+void                  gtk_action_set_icon_name          (GtkAction   *action,
+                                                         const gchar *icon_name);
+G_CONST_RETURN gchar *gtk_action_get_icon_name          (GtkAction   *action);
+void                  gtk_action_set_visible_horizontal (GtkAction   *action,
+                                                         gboolean     visible_horizontal);
+gboolean              gtk_action_get_visible_horizontal (GtkAction   *action);
+void                  gtk_action_set_visible_vertical   (GtkAction   *action,
+                                                         gboolean     visible_vertical);
+gboolean              gtk_action_get_visible_vertical   (GtkAction   *action);
+void                  gtk_action_set_is_important       (GtkAction   *action,
+                                                         gboolean     is_important);
+gboolean              gtk_action_get_is_important       (GtkAction   *action);
+void                  gtk_action_set_always_show_image  (GtkAction   *action,
+                                                         gboolean     always_show);
+gboolean              gtk_action_get_always_show_image  (GtkAction   *action);
+
+
 G_END_DECLS
 
 #endif  /* __GTK_ACTION_H__ */