AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues Projects Releases Wiki Activity

gtk/gtktoolbutton.c: use accessor functions to access GtkWidget

Browse Source
This commit is contained in:
Javier Jardón 2010-08-11 22:51:57 +02:00
parent 5e2c943742
commit 7e753a9a86
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtktoolbutton.c
View File

@ -323,6 +323,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
guint icon_spacing;
GtkOrientation text_orientation = GTK_ORIENTATION_HORIZONTAL;
GtkSizeGroup *size_group = NULL;
GtkWidget *parent;
button->priv->contents_invalid = FALSE;
@ -330,16 +331,24 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
"icon-spacing", &icon_spacing,
NULL);
if (button->priv->icon_widget && button->priv->icon_widget->parent)
if (button->priv->icon_widget)
{
gtk_container_remove (GTK_CONTAINER (button->priv->icon_widget->parent),
button->priv->icon_widget);
parent = gtk_widget_get_parent (button->priv->icon_widget);
if (parent)
{
gtk_container_remove (GTK_CONTAINER (parent),
button->priv->icon_widget);
}
}
if (button->priv->label_widget && button->priv->label_widget->parent)
if (button->priv->label_widget)
{
gtk_container_remove (GTK_CONTAINER (button->priv->label_widget->parent),
button->priv->label_widget);
parent = gtk_widget_get_parent (button->priv->label_widget);
if (parent)
{
gtk_container_remove (GTK_CONTAINER (parent),
button->priv->label_widget);
}
}
child = gtk_bin_get_child (GTK_BIN (button->priv->button));
@ -1193,9 +1202,12 @@ gtk_tool_button_set_icon_widget (GtkToolButton *button,
{
if (button->priv->icon_widget)
{
if (button->priv->icon_widget->parent)
gtk_container_remove (GTK_CONTAINER (button->priv->icon_widget->parent),
button->priv->icon_widget);
GtkWidget *parent;
parent = gtk_widget_get_parent (button->priv->icon_widget);
if (parent)
gtk_container_remove (GTK_CONTAINER (parent),
button->priv->icon_widget);
g_object_unref (button->priv->icon_widget);
}
@ -1234,10 +1246,13 @@ gtk_tool_button_set_label_widget (GtkToolButton *button,
{
if (button->priv->label_widget)
{
if (button->priv->label_widget->parent)
gtk_container_remove (GTK_CONTAINER (button->priv->label_widget->parent),
button->priv->label_widget);
GtkWidget *parent;
parent = gtk_widget_get_parent (button->priv->label_widget);
if (parent)
gtk_container_remove (GTK_CONTAINER (parent),
button->priv->label_widget);
g_object_unref (button->priv->label_widget);
}