comctl32:toolbar: Use HOT imagelist for buttons in CHECKED state

Oleg Krylov oleg.krylov at gmail.com
Thu Jul 27 08:07:14 CDT 2006


comctl32:toolbar: Use HOT imagelist for buttons in CHECKED state

changelog: 27.07.2006. by Oleg Krylov <oleg.krylov at gmail.com>

Depressed toolbar buttons (CHECKED state) should use HOT image list if
available.
Fixes one part of a Bug#: 4947:
"In Finale 2006, the toolbar buttons do not seem "depressed" after I click on
them (even though they are internally)"

===============
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