X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkradiomenuitem.c;h=29011caa13c74677606ff8d96d2254fd32aa118d;hb=fd51c8f5e9d6fb68c8e81b9b1e2ab80931f963f0;hp=5d2745e42a725be65c4edcd505cde5ee050513f8;hpb=5f1b5d24067468fc86b28dccc504c71abdaf68b8;p=~andy%2Fgtk
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 5d2745e42..29011caa1 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser 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 .
*/
/*
@@ -31,9 +29,43 @@
#include "gtkactivatable.h"
#include "gtkprivate.h"
#include "gtkintl.h"
+#include "a11y/gtkradiomenuitemaccessible.h"
+
+/**
+ * SECTION:gtkradiomenuitem
+ * @Short_description: A choice from multiple check menu items
+ * @Title: GtkRadioMenuItem
+ * @See_also: #GtkMenuItem, #GtkCheckMenuItem
+ *
+ * A radio menu item is a check menu item that belongs to a group. At each
+ * instant exactly one of the radio menu items from a group is selected.
+ *
+ * The group list does not need to be freed, as each #GtkRadioMenuItem will
+ * remove itself and its list item when it is destroyed.
+ *
+ * The correct way to create a group of radio menu items is approximatively
+ * this:
+ *
+ *
+ * How to create a group of radio menu items.
+ *
+ * GSList *group = NULL;
+ * GtkWidget *item;
+ * gint i;
+ *
+ * for (i = 0; i < 5; i++)
+ * {
+ * item = gtk_radio_menu_item_new_with_label (group, "This is an example");
+ * group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ * if (i == 1)
+ * gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+ * }
+ *
+ *
+ */
-struct _GtkRadioMenuItemPriv
+struct _GtkRadioMenuItemPrivate
{
GSList *group;
};
@@ -44,7 +76,7 @@ enum {
};
-static void gtk_radio_menu_item_destroy (GtkObject *object);
+static void gtk_radio_menu_item_destroy (GtkWidget *widget);
static void gtk_radio_menu_item_activate (GtkMenuItem *menu_item);
static void gtk_radio_menu_item_set_property (GObject *object,
guint prop_id,
@@ -59,6 +91,15 @@ static guint group_changed_signal = 0;
G_DEFINE_TYPE (GtkRadioMenuItem, gtk_radio_menu_item, GTK_TYPE_CHECK_MENU_ITEM)
+/**
+ * gtk_radio_menu_item_new:
+ * @group: (element-type GtkRadioMenuItem): the group to which the
+ * radio menu item is to be attached
+ *
+ * Creates a new #GtkRadioMenuItem.
+ *
+ * Returns: a new #GtkRadioMenuItem
+ */
GtkWidget*
gtk_radio_menu_item_new (GSList *group)
{
@@ -86,10 +127,9 @@ gtk_radio_menu_item_set_property (GObject *object,
GSList *slist;
case PROP_GROUP:
- if (G_VALUE_HOLDS_OBJECT (value))
- slist = gtk_radio_menu_item_get_group ((GtkRadioMenuItem*) g_value_get_object (value));
- else
- slist = NULL;
+ slist = g_value_get_object (value);
+ if (slist)
+ slist = gtk_radio_menu_item_get_group ((GtkRadioMenuItem*) g_value_get_object (value));
gtk_radio_menu_item_set_group (radio_menu_item, slist);
break;
default:
@@ -112,11 +152,18 @@ gtk_radio_menu_item_get_property (GObject *object,
}
}
+/**
+ * gtk_radio_menu_item_set_group:
+ * @radio_menu_item: a #GtkRadioMenuItem.
+ * @group: (element-type GtkRadioMenuItem): the new group.
+ *
+ * Sets the group of a radio menu item, or changes it.
+ */
void
gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
GSList *group)
{
- GtkRadioMenuItemPriv *priv;
+ GtkRadioMenuItemPrivate *priv;
GtkWidget *old_group_singleton = NULL;
GtkWidget *new_group_singleton = NULL;
@@ -164,7 +211,7 @@ gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
}
else
{
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (radio_menu_item), TRUE);
+ _gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (radio_menu_item), TRUE);
/* gtk_widget_set_state (GTK_WIDGET (radio_menu_item), GTK_STATE_ACTIVE);
*/
}
@@ -201,58 +248,44 @@ GtkWidget*
gtk_radio_menu_item_new_with_label (GSList *group,
const gchar *label)
{
- GtkWidget *radio_menu_item;
- GtkWidget *accel_label;
-
- radio_menu_item = gtk_radio_menu_item_new (group);
- accel_label = gtk_accel_label_new (label);
- gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
- gtk_container_add (GTK_CONTAINER (radio_menu_item), accel_label);
- gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), radio_menu_item);
- gtk_widget_show (accel_label);
-
- return radio_menu_item;
+ return g_object_new (GTK_TYPE_RADIO_MENU_ITEM,
+ "group", (group) ? group->data : NULL,
+ "label", label,
+ NULL);
}
/**
* gtk_radio_menu_item_new_with_mnemonic:
- * @group: group the radio menu item is inside
+ * @group: (element-type GtkRadioMenuItem): group the radio menu item is inside
* @label: the text of the button, with an underscore in front of the
* mnemonic character
- * @returns: a new #GtkRadioMenuItem
*
* Creates a new #GtkRadioMenuItem containing a label. The label
* will be created using gtk_label_new_with_mnemonic(), so underscores
* in @label indicate the mnemonic for the menu item.
- **/
+ *
+ * Returns: a new #GtkRadioMenuItem
+ */
GtkWidget*
gtk_radio_menu_item_new_with_mnemonic (GSList *group,
const gchar *label)
{
- GtkWidget *radio_menu_item;
- GtkWidget *accel_label;
-
- radio_menu_item = gtk_radio_menu_item_new (group);
- accel_label = g_object_new (GTK_TYPE_ACCEL_LABEL, NULL);
- gtk_label_set_text_with_mnemonic (GTK_LABEL (accel_label), label);
- gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
-
- gtk_container_add (GTK_CONTAINER (radio_menu_item), accel_label);
- gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), radio_menu_item);
- gtk_widget_show (accel_label);
-
- return radio_menu_item;
+ return g_object_new (GTK_TYPE_RADIO_MENU_ITEM,
+ "group", (group) ? group->data : NULL,
+ "label", label,
+ "use-underline", TRUE,
+ NULL);
}
/**
- * gtk_radio_menu_item_new_from_widget:
+ * gtk_radio_menu_item_new_from_widget: (constructor)
* @group: An existing #GtkRadioMenuItem
- *
+ *
* Creates a new #GtkRadioMenuItem adding it to the same group as @group.
- *
- * Return value: The new #GtkRadioMenuItem
- *
+ *
+ * Return value: (transfer none): The new #GtkRadioMenuItem
+ *
* Since: 2.4
**/
GtkWidget *
@@ -269,7 +302,7 @@ gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
}
/**
- * gtk_radio_menu_item_new_with_mnemonic_from_widget:
+ * gtk_radio_menu_item_new_with_mnemonic_from_widget: (constructor)
* @group: An existing #GtkRadioMenuItem
* @label: the text of the button, with an underscore in front of the
* mnemonic character
@@ -280,8 +313,8 @@ gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
*
* The new #GtkRadioMenuItem is added to the same group as @group.
*
- * Return value: The new #GtkRadioMenuItem
- *
+ * Return value: (transfer none): The new #GtkRadioMenuItem
+ *
* Since: 2.4
**/
GtkWidget *
@@ -299,15 +332,15 @@ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
}
/**
- * gtk_radio_menu_item_new_with_label_from_widget:
- * @group: an existing #GtkRadioMenuItem
+ * gtk_radio_menu_item_new_with_label_from_widget: (constructor)
+ * @group: an existing #GtkRadioMenuItem
* @label: the text for the label
*
* Creates a new GtkRadioMenuItem whose child is a simple GtkLabel.
* The new #GtkRadioMenuItem is added to the same group as @group.
*
- * Return value: The new #GtkRadioMenuItem
- *
+ * Return value: (transfer none): The new #GtkRadioMenuItem
+ *
* Since: 2.4
**/
GtkWidget *
@@ -324,6 +357,16 @@ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
return gtk_radio_menu_item_new_with_label (list, label);
}
+/**
+ * gtk_radio_menu_item_get_group:
+ * @radio_menu_item: a #GtkRadioMenuItem
+ *
+ * Returns the group to which the radio menu item belongs, as a #GList of
+ * #GtkRadioMenuItem. The list belongs to GTK+ and should not be freed.
+ *
+ * Returns: (element-type GtkRadioMenuItem) (transfer none): the group
+ * of @radio_menu_item
+ */
GSList*
gtk_radio_menu_item_get_group (GtkRadioMenuItem *radio_menu_item)
{
@@ -332,21 +375,26 @@ gtk_radio_menu_item_get_group (GtkRadioMenuItem *radio_menu_item)
return radio_menu_item->priv->group;
}
-
static void
gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
+ GObjectClass *gobject_class;
+ GtkWidgetClass *widget_class;
GtkMenuItemClass *menu_item_class;
gobject_class = G_OBJECT_CLASS (klass);
- object_class = GTK_OBJECT_CLASS (klass);
+ widget_class = GTK_WIDGET_CLASS (klass);
menu_item_class = GTK_MENU_ITEM_CLASS (klass);
gobject_class->set_property = gtk_radio_menu_item_set_property;
gobject_class->get_property = gtk_radio_menu_item_get_property;
+ widget_class->destroy = gtk_radio_menu_item_destroy;
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE);
+
+ menu_item_class->activate = gtk_radio_menu_item_activate;
+
/**
* GtkRadioMenuItem:group:
*
@@ -362,10 +410,6 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
GTK_TYPE_RADIO_MENU_ITEM,
GTK_PARAM_WRITABLE));
- object_class->destroy = gtk_radio_menu_item_destroy;
-
- menu_item_class->activate = gtk_radio_menu_item_activate;
-
/**
* GtkStyle::group-changed:
* @style: the object which received the signal
@@ -380,24 +424,24 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
* Since: 2.4
*/
group_changed_signal = g_signal_new (I_("group-changed"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkRadioMenuItemClass, group_changed),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- g_type_class_add_private (klass, sizeof (GtkRadioMenuItemPriv));
+ g_type_class_add_private (klass, sizeof (GtkRadioMenuItemPrivate));
}
static void
gtk_radio_menu_item_init (GtkRadioMenuItem *radio_menu_item)
{
- GtkRadioMenuItemPriv *priv;
+ GtkRadioMenuItemPrivate *priv;
radio_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_menu_item,
GTK_TYPE_RADIO_MENU_ITEM,
- GtkRadioMenuItemPriv);
+ GtkRadioMenuItemPrivate);
priv = radio_menu_item->priv;
priv->group = g_slist_prepend (NULL, radio_menu_item);
@@ -405,10 +449,10 @@ gtk_radio_menu_item_init (GtkRadioMenuItem *radio_menu_item)
}
static void
-gtk_radio_menu_item_destroy (GtkObject *object)
+gtk_radio_menu_item_destroy (GtkWidget *widget)
{
- GtkRadioMenuItem *radio_menu_item = GTK_RADIO_MENU_ITEM (object);
- GtkRadioMenuItemPriv *priv = radio_menu_item->priv;
+ GtkRadioMenuItem *radio_menu_item = GTK_RADIO_MENU_ITEM (widget);
+ GtkRadioMenuItemPrivate *priv = radio_menu_item->priv;
GtkWidget *old_group_singleton = NULL;
GtkRadioMenuItem *tmp_menu_item;
GSList *tmp_list;
@@ -438,14 +482,14 @@ gtk_radio_menu_item_destroy (GtkObject *object)
if (was_in_group)
g_signal_emit (radio_menu_item, group_changed_signal, 0);
- GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy (object);
+ GTK_WIDGET_CLASS (gtk_radio_menu_item_parent_class)->destroy (widget);
}
static void
gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
{
GtkRadioMenuItem *radio_menu_item = GTK_RADIO_MENU_ITEM (menu_item);
- GtkRadioMenuItemPriv *priv = radio_menu_item->priv;
+ GtkRadioMenuItemPrivate *priv = radio_menu_item->priv;
GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
GtkCheckMenuItem *tmp_menu_item;
GtkAction *action;
@@ -480,13 +524,13 @@ gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
if (tmp_menu_item)
{
toggled = TRUE;
- gtk_check_menu_item_set_active (check_menu_item, !active);
+ _gtk_check_menu_item_set_active (check_menu_item, !active);
}
}
else
{
toggled = TRUE;
- gtk_check_menu_item_set_active (check_menu_item, !active);
+ _gtk_check_menu_item_set_active (check_menu_item, !active);
tmp_list = priv->group;
while (tmp_list)