AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

tool palette: Fix compiler warnings

Browse Source 
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
This commit is contained in:
Matthias Clasen 2015-05-30 21:28:44 -04:00
parent 5dc440295e
commit 555663c686
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtktoolpalette.c
View File

@ -621,13 +621,10 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
for (i = 0; i < palette->priv->groups->len; ++i)
{
GtkToolItemGroupInfo *group = g_ptr_array_index (palette->priv->groups, i);
GtkWidget *widget;
if (!group->widget)
continue;
widget = GTK_WIDGET (group->widget);
if (gtk_tool_item_group_get_n_items (group->widget))
{
gint size = group_sizes[i];
@ -649,8 +646,8 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
else
child_allocation.x = x;
gtk_widget_size_allocate (widget, &child_allocation);
gtk_widget_show (widget);
gtk_widget_size_allocate (GTK_WIDGET (group->widget), &child_allocation);
gtk_widget_show (GTK_WIDGET (group->widget));
if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
child_allocation.y += child_allocation.height;
@ -658,7 +655,7 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
x += child_allocation.width;
}
else
gtk_widget_hide (widget);
gtk_widget_hide (GTK_WIDGET (group->widget));
}
if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)