Fix disabled toolbar button actions

Carlos clozano at andago.com
Sun Oct 13 14:32:39 CDT 2002


Hello,

Testing 12zip.exe, found that you can click in a 
toolbar button what is disabled, and it shows a window.
The next patch fixes the problem, please if someone
is working in the toolbar code, check if it is a correct fix.

Changelog:
 * Fix disabled toolbar button actions.

Regards,
Carlos.


-- 
____________________________________________________
     ___   _____  _   ____
    / __// _   // /  / o)    clozano
   / /_ / /_/ // /_ /  \  @andago.com
  /___//_/ /_//___//__)
____________________________________________________

-------------- next part --------------
Index: dlls/comctl32/toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.120
diff -u -r1.120 toolbar.c
--- dlls/comctl32/toolbar.c	6 Sep 2002 19:41:17 -0000	1.120
+++ dlls/comctl32/toolbar.c	13 Oct 2002 19:24:25 -0000
@@ -4759,8 +4759,10 @@
     if (nHit >= 0) {
 	RECT arrowRect;
 	btnPtr = &infoPtr->buttons[nHit];
-	if (!(btnPtr->fsState & TBSTATE_ENABLED))
+	if (!(btnPtr->fsState & TBSTATE_ENABLED)) {
+	    infoPtr->nButtonDown = nHit;
 	    return 0;
+        }
 
 	infoPtr->nOldHit = nHit;
 
@@ -4848,6 +4850,9 @@
         infoPtr->buttons[infoPtr->nHotItem].bHot = TRUE;
 
 	btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
+	if (!(btnPtr->fsState & TBSTATE_ENABLED))
+	    return 0;
+
 	btnPtr->fsState &= ~TBSTATE_PRESSED;
 
 	if (btnPtr->fsStyle & TBSTYLE_CHECK) {


More information about the wine-patches mailing list