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

widget: 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:30:11 -04:00
parent 121c195521
commit 165861323a
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkwidget.c
View File

@ -5287,6 +5287,20 @@ destroy_tick_callback_info (GtkWidget *widget,
}
}
static void
destroy_tick_callbacks (GtkWidget *widget)
{
GtkWidgetPrivate *priv = widget->priv;
GList *l;
for (l = priv->tick_callbacks; l;)
{
GList *next = l->next;
destroy_tick_callback_info (widget, l->data, l);
l = next;
}
}
static void
gtk_widget_on_frame_clock_update (GdkFrameClock *frame_clock,
GtkWidget *widget)
@ -12066,7 +12080,6 @@ gtk_widget_real_destroy (GtkWidget *object)
/* gtk_object_destroy() will already hold a refcount on object */
GtkWidget *widget = GTK_WIDGET (object);
GtkWidgetPrivate *priv = widget->priv;
GList *l;
if (priv->auto_children)
{
@ -12154,12 +12167,7 @@ gtk_widget_real_destroy (GtkWidget *object)
gtk_grab_remove (widget);
for (l = priv->tick_callbacks; l;)
{
GList *next = l->next;
destroy_tick_callback_info (widget, l->data, l);
l = next;
}
destroy_tick_callbacks (widget);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (priv->style)
@ -12812,14 +12820,14 @@ gtk_widget_propagate_state (GtkWidget *widget,
if (!gtk_widget_is_sensitive (widget))
{
EventControllerData *data;
EventControllerData *controller_data;
GList *l;
/* Reset all controllers */
for (l = priv->event_controllers; l; l = l->next)
{
data = l->data;
gtk_event_controller_reset (data->controller);
controller_data = l->data;
gtk_event_controller_reset (controller_data->controller);
}
}