[Scummvm-cvs-logs] CVS: scummvm/gui ThemeNew.cpp,1.22,1.23

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv558

Modified Files:
	ThemeNew.cpp 
Log Message:
Change behaviour of checkboxes to more logical.


Index: ThemeNew.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ThemeNew.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ThemeNew.cpp	3 Feb 2006 07:30:29 -0000	1.22
+++ ThemeNew.cpp	5 Feb 2006 18:46:51 -0000	1.23
@@ -587,12 +587,9 @@
 	int checkBoxSize = checkBox->w;
 	
 	restoreBackground(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h));
-	if (state == kStateHighlight && !checked) {
-		checkBox = surface(!checked ? kCheckboxChecked : kCheckboxEmpty);
-		drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, 128);
-	} else {
-		drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, (state == kStateDisabled) ? 128 : 256);
-	}
+
+	drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, (state == kStateDisabled) ? 128 : 256);
+
 	r2.left += checkBoxSize + 5;
 	_font->drawString(&_screen, str, r2.left, r2.top, r2.width(), getColor(state), Graphics::kTextAlignCenter, 0, false);