head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.42
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.40
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.38
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.36
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.34
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.32
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.30
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.28
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.26
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.24
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.22
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.20
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.18
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.16
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.14
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.12
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.10
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.8
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.6
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.4
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.2
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.1.0.2
	pkgsrc-2005Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.05.10.20.26.05;	author jmmv;	state dead;
branches;
next	1.1;

1.1
date	2005.03.16.15.30.21;	author rillig;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove gtk2-engines-clearlooks.  The GTK2 part has been merged into
gtk2-engines in version 2.6.3.  The Metacity part will be imported as a
separate package.
@
text
@$NetBSD: patch-ac,v 1.1 2005/03/16 15:30:21 rillig Exp $

gcc-2.95.3 cannot handle declarations intermixed with code.

--- src/clearlooks_style.c.orig	Thu Mar  3 22:43:15 2005
+++ src/clearlooks_style.c	Wed Mar 16 14:33:40 2005
@@@@ -548,13 +548,12 @@@@ draw_extension (DRAW_ARGS, GtkPositionTy
 	if (DETAIL ("tab"))
 	{
 		GdkRectangle new_area;
+		GdkColor tmp_color;
 	
 		cl_rectangle_set_button (&r, style, state_type, FALSE,
 								CL_CORNER_ROUND, CL_CORNER_ROUND,
 								CL_CORNER_ROUND, CL_CORNER_ROUND);
 
-		GdkColor tmp_color;
-		
 		if (state_type == GTK_STATE_ACTIVE)
 			shade (&style->bg[state_type], &tmp_color, 1.08);
 		else
@@@@ -866,7 +865,7 @@@@ draw_box (DRAW_ARGS)
 	if (widget && DETAIL ("button") && widget->parent &&
 	         (GTK_IS_TREE_VIEW(widget->parent) || GTK_IS_CLIST (widget->parent))) // headers
 	{
-		gint columns = 0, column_index = 0;
+		gint columns = 0, column_index = 0, nwidth;
 
 		if ( width < 2 || height < 2 )
 			return;
@@@@ -874,7 +873,7 @@@@ draw_box (DRAW_ARGS)
 		if (GTK_IS_TREE_VIEW (widget->parent))
 			gtk_treeview_get_header_index (widget->parent, widget, &column_index, &columns);
 		
-		int nwidth = (column_index == columns-1) ? width : width+1;
+		nwidth = (column_index == columns-1) ? width : width+1;
 
 		cl_rectangle_set_button (&r, style, state_type, FALSE,
 		                        CL_CORNER_NONE, CL_CORNER_NONE,
@@@@ -1189,12 +1188,13 @@@@ draw_box (DRAW_ARGS)
 	{
 		gboolean menubar = (widget->parent && GTK_IS_MENU_BAR(widget->parent)) ? TRUE : FALSE;
 		gboolean flatmenu = FALSE;
+		int corner;
 	
 		GdkColor inner_lower;
 		
 		shade (clearlooks_get_spot_color (CLEARLOOKS_RC_STYLE (style->rc_style)), &inner_lower, 1.3);
 
-		int corner = CL_CORNER_NARROW;
+		corner = CL_CORNER_NARROW;
 		
 		if (menubar)
 		{
@


1.1
log
@Added some patches for building with gcc-2.95.3. Approved by wiz.
@
text
@d1 1
a1 1
$NetBSD$
@