[RESEND 2] comctl32:toolbar: Use HOT imagelist for buttons in CHECKED state

Oleg Krylov oleg.krylov at gmail.com
Wed Aug 16 12:59:46 CDT 2006


Hello,

RESEND: added changelog and license

Depressed toolbar buttons (CHECKED state) should use HOT image list if 
available.
This fixed a part of Bug#: 4974

Changelog:
 - Draw depressed toolbar buttons using HOT imagelist if it is set.
Author: Oleg Krylov <oleg.krylov at gmail.com>
License: LGPL

-------------- next part --------------
diff -urN wine/dlls/comctl32/toolbar.c wineNew/dlls/comctl32/toolbar.c
--- wine/dlls/comctl32/toolbar.c	2006-05-23 15:47:38.000000000 +0300
+++ wineNew/dlls/comctl32/toolbar.c	2006-07-27 12:57:35.000000000 +0300
@@ -696,8 +696,9 @@
             draw_masked = TRUE;
         }
     }
-    else if ((tbcd->nmcd.uItemState & CDIS_HOT) 
-      && ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)))
+    else if (tbcd->nmcd.uItemState & CDIS_CHECKED ||
+      ((tbcd->nmcd.uItemState & CDIS_HOT) 
+      && ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf))))
     {
         /* if hot, attempt to draw with hot image list, if fails, 
            use default image list */


More information about the wine-patches mailing list