X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkactivatable.h;h=4ff90f8e12547a53877e6f756c42758745ad1239;hb=61344219d4ba6d81854cc5bea8cf90f600358501;hp=75478899edb9ae0ae57ccb37b32e41b4f9b327eb;hpb=bb72b647f6a40831a46fb731a5929831d95c2b29;p=~andy%2Fgtk
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 75478899e..4ff90f8e1 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -12,20 +12,17 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_ACTIVATABLE_H__
#define __GTK_ACTIVATABLE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
-#include
G_BEGIN_DECLS
@@ -45,9 +42,9 @@ typedef struct _GtkActivatableIface GtkActivatableIface;
* @update: Called to update the activatable when its related action's properties change.
* You must check the #GtkActivatable:use-action-appearance property only apply action
* properties that are meant to effect the appearance accordingly.
- * @reset: Called to update the activatable completely, this is called internally when
- * #GtkActivatable::related-action property is set or unset and by the implementor when
- * #GtkActivatable::use-action-appearance changes.This method can be called
+ * @sync_action_properties: Called to update the activatable completely, this is called internally when
+ * #GtkActivatable:related-action property is set or unset and by the implementor when
+ * #GtkActivatable:use-action-appearance changes.This method can be called
* with a %NULL action at times
*
* Since: 2.16
@@ -58,17 +55,17 @@ struct _GtkActivatableIface
GTypeInterface g_iface;
/* virtual table */
- void (* update) (GtkActivatable *activatable,
- GtkAction *action,
- const gchar *property_name);
- void (* reset) (GtkActivatable *activatable,
- GtkAction *action);
+ void (* update) (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name);
+ void (* sync_action_properties) (GtkActivatable *activatable,
+ GtkAction *action);
};
GType gtk_activatable_get_type (void) G_GNUC_CONST;
-void gtk_activatable_reset (GtkActivatable *activatable,
+void gtk_activatable_sync_action_properties (GtkActivatable *activatable,
GtkAction *action);
void gtk_activatable_set_related_action (GtkActivatable *activatable,