Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radio menu item: Drop the priv pointer

Browse Source
This commit is contained in:
Matthias Clasen
2019-05-27 00:28:49 -04:00
parent d26eb4fce7
commit 273fa042a8
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/gtkradiomenuitem.c
View File

@@ -74,14 +74,12 @@
* with name radio, which gets the .left or .right style class.
*/
typedef struct _GtkRadioMenuItemPrivate GtkRadioMenuItemPrivate;
typedef struct _GtkRadioMenuItemClass GtkRadioMenuItemClass;
typedef struct _GtkRadioMenuItemPrivate GtkRadioMenuItemPrivate;
typedef struct _GtkRadioMenuItemClass GtkRadioMenuItemClass;
struct _GtkRadioMenuItem
{
GtkCheckMenuItem check_menu_item;
GtkRadioMenuItemPrivate *priv;
};
struct _GtkRadioMenuItemClass
@@ -189,14 +187,12 @@ void
gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
GSList *group)
{
GtkRadioMenuItemPrivate *priv;
GtkRadioMenuItemPrivate *priv = gtk_radio_menu_item_get_instance_private (radio_menu_item);
GtkWidget *old_group_singleton = NULL;
GtkWidget *new_group_singleton = NULL;
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (radio_menu_item));
priv = radio_menu_item->priv;
if (priv->group == group)
return;
@@ -211,11 +207,10 @@ gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
for (slist = priv->group; slist; slist = slist->next)
{
GtkRadioMenuItem *tmp_item;
tmp_item = slist->data;
GtkRadioMenuItem *tmp_item = slist->data;
GtkRadioMenuItemPrivate *tmp_priv = gtk_radio_menu_item_get_instance_private (tmp_item);
tmp_item->priv->group = priv->group;
tmp_priv->group = priv->group;
}
}
@@ -230,11 +225,10 @@ gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
for (slist = group; slist; slist = slist->next)
{
GtkRadioMenuItem *tmp_item;
tmp_item = slist->data;
GtkRadioMenuItem *tmp_item = slist->data;
GtkRadioMenuItemPrivate *tmp_priv = gtk_radio_menu_item_get_instance_private (tmp_item);
tmp_item->priv->group = priv->group;
tmp_priv->group = priv->group;
}
_gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (radio_menu_item), FALSE);
@@ -396,9 +390,11 @@ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
GSList*
gtk_radio_menu_item_get_group (GtkRadioMenuItem *radio_menu_item)
{
GtkRadioMenuItemPrivate *priv = gtk_radio_menu_item_get_instance_private (radio_menu_item);
g_return_val_if_fail (GTK_IS_RADIO_MENU_ITEM (radio_menu_item), NULL);
return radio_menu_item->priv->group;
return priv->group;
}
static void
@@ -457,10 +453,7 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
static void
gtk_radio_menu_item_init (GtkRadioMenuItem *radio_menu_item)
{
GtkRadioMenuItemPrivate *priv;
radio_menu_item->priv = gtk_radio_menu_item_get_instance_private (radio_menu_item);
priv = radio_menu_item->priv;
GtkRadioMenuItemPrivate *priv = gtk_radio_menu_item_get_instance_private (radio_menu_item);
priv->group = g_slist_prepend (NULL, radio_menu_item);
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (radio_menu_item), TRUE);
@@ -470,9 +463,8 @@ static void
gtk_radio_menu_item_destroy (GtkWidget *widget)
{
GtkRadioMenuItem *radio_menu_item = GTK_RADIO_MENU_ITEM (widget);
GtkRadioMenuItemPrivate *priv = radio_menu_item->priv;
GtkRadioMenuItemPrivate *priv = gtk_radio_menu_item_get_instance_private (radio_menu_item);
GtkWidget *old_group_singleton = NULL;
GtkRadioMenuItem *tmp_menu_item;
GSList *tmp_list;
gboolean was_in_group;
@@ -486,10 +478,11 @@ gtk_radio_menu_item_destroy (GtkWidget *widget)
while (tmp_list)
{
tmp_menu_item = tmp_list->data;
GtkRadioMenuItem *tmp_item = tmp_list->data;
GtkRadioMenuItemPrivate *tmp_priv = gtk_radio_menu_item_get_instance_private (tmp_item);
tmp_list = tmp_list->next;
tmp_menu_item->priv->group = priv->group;
tmp_priv->group = priv->group;
}
/* this radio menu item is no longer in the group */
@@ -507,7 +500,7 @@ static void
gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
{
GtkRadioMenuItem *radio_menu_item = GTK_RADIO_MENU_ITEM (menu_item);
GtkRadioMenuItemPrivate *priv = radio_menu_item->priv;
GtkRadioMenuItemPrivate *priv = gtk_radio_menu_item_get_instance_private (radio_menu_item);
GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
GtkCheckMenuItem *tmp_menu_item;
GSList *tmp_list;