My last patch to correct the positioning of the checkbox introduced a
little regression in the background filling. This one fixes that.
Max
ChangeLog:
* Correctly fills the background of a checkbox button
--
Maxime Bellengà <maxime.bellenge@laposte.net>
Index: wine/controls/button.c
===================================================================
RCS file: /home/wine/wine/controls/button.c,v
retrieving revision 1.64
diff -u -r1.64 button.c
--- wine/controls/button.c 30 Apr 2003 23:57:43 -0000 1.64
+++ wine/controls/button.c 7 May 2003 19:40:40 -0000
@@ -861,6 +861,10 @@
rtext.left += checkBoxWidth + 4;
rbox.right = checkBoxWidth;
}
+
+ /* Since WM_ERASEBKGND does nothing, first prepare background */
+ if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush );
+ if (action == ODA_DRAWENTIRE) FillRect( hDC, &client, hBrush );
/* Draw label */
client = rtext;
@@ -871,10 +875,6 @@
/* Draw the check-box bitmap */
if (action == ODA_DRAWENTIRE || action == ODA_SELECT)
{
- /* Since WM_ERASEBKGND does nothing, first prepare background */
- if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush );
- else FillRect( hDC, &client, hBrush );
-
if( TWEAK_WineLook == WIN31_LOOK )
{
HDC hMemDC = CreateCompatibleDC( hDC );
