X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkactivatable.c;h=46ffa1bd2f2384eca82a1cc538dd18246f1be10a;hb=0ba92bc26d1b716f2f9c0543593f13cd5a92c521;hp=77b019ba4d93147c7eb61c1d2c2b5d1d41ddf862;hpb=5f1b5d24067468fc86b28dccc504c71abdaf68b8;p=~andy%2Fgtk
diff --git a/gtk/gtkactivatable.c b/gtk/gtkactivatable.c
index 77b019ba4..46ffa1bd2 100644
--- a/gtk/gtkactivatable.c
+++ b/gtk/gtkactivatable.c
@@ -12,9 +12,7 @@
* 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 .
*/
/**
@@ -263,33 +261,15 @@
#include "config.h"
#include "gtkactivatable.h"
#include "gtkactiongroup.h"
-#include "gtktypeutils.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-static void gtk_activatable_class_init (gpointer g_iface);
-
-GType
-gtk_activatable_get_type (void)
-{
- static GType activatable_type = 0;
-
- if (!activatable_type) {
- activatable_type =
- g_type_register_static_simple (G_TYPE_INTERFACE, I_("GtkActivatable"),
- sizeof (GtkActivatableIface),
- (GClassInitFunc) gtk_activatable_class_init,
- 0, NULL, 0);
-
- g_type_interface_add_prerequisite (activatable_type, G_TYPE_OBJECT);
- }
-
- return activatable_type;
-}
+typedef GtkActivatableIface GtkActivatableInterface;
+G_DEFINE_INTERFACE (GtkActivatable, gtk_activatable, G_TYPE_OBJECT)
static void
-gtk_activatable_class_init (gpointer g_iface)
+gtk_activatable_default_init (GtkActivatableInterface *iface)
{
/**
* GtkActivatable:related-action:
@@ -302,7 +282,7 @@ gtk_activatable_class_init (gpointer g_iface)
*
* Since: 2.16
*/
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_object ("related-action",
P_("Related Action"),
P_("The action this activatable will activate and receive updates from"),
@@ -325,7 +305,7 @@ gtk_activatable_class_init (gpointer g_iface)
*
* Since: 2.16
*/
- g_object_interface_install_property (g_iface,
+ g_object_interface_install_property (iface,
g_param_spec_boolean ("use-action-appearance",
P_("Use Action Appearance"),
P_("Whether to use the related actions appearance properties"),
@@ -358,9 +338,9 @@ gtk_activatable_update (GtkActivatable *activatable,
* @action: (allow-none): the related #GtkAction or %NULL
*
* This is called to update the activatable completely, this is called
- * internally when the #GtkActivatable::related-action property is set
+ * internally when the #GtkActivatable:related-action property is set
* or unset and by the implementing class when
- * #GtkActivatable::use-action-appearance changes.
+ * #GtkActivatable:use-action-appearance changes.
*
* Since: 2.16
**/
@@ -429,7 +409,8 @@ gtk_activatable_action_notify (GtkAction *action,
*
* Be careful to call this before setting the local
* copy of the #GtkAction property, since this function uses
- * gtk_activatable_get_action() to retrieve the previous action
+ * gtk_activatable_get_related_action() to retrieve the
+ * previous action
*
* Since: 2.16
*/
@@ -495,7 +476,7 @@ gtk_activatable_do_set_related_action (GtkActivatable *activatable,
*
* Gets the related #GtkAction for @activatable.
*
- * Returns: the related #GtkAction if one is set.
+ * Returns: (transfer none): the related #GtkAction if one is set.
*
* Since: 2.16
**/