AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 06:51:10 +00:00
Code Issues Projects Releases Wiki Activity

css: 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:24:48 -04:00
parent f16fc99391
commit 29ab70b801
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkcssimagewin32.c
View File

@ -41,18 +41,18 @@ gtk_css_image_win32_draw (GtkCssImage *image,
if (wimage->state2 >= 0) if (wimage->state2 >= 0)
{ {
cairo_surface_t *surface2; cairo_surface_t *surface2;
cairo_t *cr; cairo_t *cr2;
int dx2, dy2; int dx2, dy2;
surface2 = _gtk_win32_theme_part_create_surface (wimage->theme, wimage->part2, wimage->state2, wimage->margins, surface2 = _gtk_win32_theme_part_create_surface (wimage->theme, wimage->part2, wimage->state2, wimage->margins,
width, height, &dx2, &dy2); width, height, &dx2, &dy2);
cr = cairo_create (surface); cr2 = cairo_create (surface);
cairo_set_source_surface (cr, surface2, dx2 - dx, dy2-dy); cairo_set_source_surface (cr2, surface2, dx2 - dx, dy2-dy);
cairo_paint_with_alpha (cr, wimage->over_alpha); cairo_paint_with_alpha (cr2, wimage->over_alpha);
cairo_destroy (cr); cairo_destroy (cr2);
cairo_surface_destroy (surface2); cairo_surface_destroy (surface2);
} }

8
gtk/gtkcssinitialvalue.c
View File

@ -66,7 +66,6 @@ gtk_css_value_initial_compute (GtkCssValue *value,
{ {
PangoFontDescription *description; PangoFontDescription *description;
char *font_name; char *font_name;
GtkCssValue *value;
g_object_get (settings, "gtk-font-name", &font_name, NULL); g_object_get (settings, "gtk-font-name", &font_name, NULL);
description = pango_font_description_from_string (font_name); description = pango_font_description_from_string (font_name);
@ -76,9 +75,12 @@ gtk_css_value_initial_compute (GtkCssValue *value,
if (pango_font_description_get_set_fields (description) & PANGO_FONT_MASK_FAMILY) if (pango_font_description_get_set_fields (description) & PANGO_FONT_MASK_FAMILY)
{ {
value = _gtk_css_array_value_new (_gtk_css_string_value_new (pango_font_description_get_family (description))); GtkCssValue *val;
val = _gtk_css_array_value_new (_gtk_css_string_value_new (pango_font_description_get_family (description)));
pango_font_description_free (description); pango_font_description_free (description);
return value;
return val;
} }
pango_font_description_free (description); pango_font_description_free (description);

8
gtk/gtkcssshadowvalue.c
View File

@ -635,13 +635,13 @@ _gtk_css_shadow_value_paint_box (const GtkCssValue *shadow,
{ {
GtkRoundedBox box, clip_box; GtkRoundedBox box, clip_box;
double spread, radius, clip_radius, x, y, outside; double spread, radius, clip_radius, x, y, outside;
double x1, y1, x2, y2; double x1c, y1c, x2c, y2c;
g_return_if_fail (shadow->class == &GTK_CSS_VALUE_SHADOW); g_return_if_fail (shadow->class == &GTK_CSS_VALUE_SHADOW);
cairo_clip_extents (cr, &x1, &y1, &x2, &y2); cairo_clip_extents (cr, &x1c, &y1c, &x2c, &y2c);
if ((shadow->inset && !_gtk_rounded_box_intersects_rectangle (padding_box, x1, y1, x2, y2)) || if ((shadow->inset && !_gtk_rounded_box_intersects_rectangle (padding_box, x1c, y1c, x2c, y2c)) ||
(!shadow->inset && _gtk_rounded_box_contains_rectangle (padding_box, x1, y1, x2, y2))) (!shadow->inset && _gtk_rounded_box_contains_rectangle (padding_box, x1c, y1c, x2c, y2c)))
return; return;
cairo_save (cr); cairo_save (cr);