Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

1 files changed, 10 insertions, 7 deletions

diff --git a/libs/clearlooks-newer/clearlooks_draw_glossy.c b/libs/clearlooks-newer/clearlooks_draw_glossy.c
index a0e250ee64..a8dd9ef7a3 100644
--- a/libs/clearlooks-newer/clearlooks_draw_glossy.c
+++ b/libs/clearlooks-newer/clearlooks_draw_glossy.c
@@ -1088,13 +1088,16 @@ clearlooks_glossy_draw_toolbar (cairo_t *cr,
                          const ToolbarParameters         *toolbar,
                          int x, int y, int width, int height)
 {
+	CairoColor light;
+	const CairoColor *dark;
+	
+	const CairoColor *fill  = &colors->bg[GTK_STATE_NORMAL];
+	dark  = &colors->shade[3];
+
 	(void) widget;
 	(void) width;
 	(void) height;
-	
-	const CairoColor *fill  = &colors->bg[GTK_STATE_NORMAL];
-	const CairoColor *dark  = &colors->shade[3];
-	CairoColor light;
+
 	ge_shade_color (fill, 1.1, &light);
 	
 	cairo_set_line_width (cr, 1.0);
@@ -1232,9 +1235,6 @@ clearlooks_glossy_draw_radiobutton (cairo_t *cr,
                              const CheckboxParameters *checkbox,
                              int x, int y, int width, int height)
 {
-	(void) width;
-	(void) height;
-	
 	const CairoColor *border;
 	const CairoColor *dot;
 	CairoColor shadow;
@@ -1243,6 +1243,9 @@ clearlooks_glossy_draw_radiobutton (cairo_t *cr,
 	gboolean inconsistent;
 	gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN);
 
+	(void) width;
+	(void) height;
+
 	inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN);
 	draw_bullet |= inconsistent;