From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 9 Dec 2008 18:35:48 +0000 (+0000)
Subject: fix for r56618: toolbar event handlers can toggle or disable tools again (patch ... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5f4250ede098c1359fe0efd2a02e6ce4c199aaae

fix for r56618: toolbar event handlers can toggle or disable tools again (patch #10241)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index bc29e61699..6399465223 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -1250,7 +1250,16 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
 
     bool allowLeftClick = OnLeftClick(id, toggled);
 
-    // restore the unpressed state
+    // Restore the unpressed state. Enabled/toggled state might have been
+    // changed since so take care of it.
+    if (tool->IsEnabled())
+        state |= TBSTATE_ENABLED;
+    else
+        state &= ~TBSTATE_ENABLED;
+    if (tool->IsToggled())
+        state |= TBSTATE_CHECKED;
+    else
+        state &= ~TBSTATE_CHECKED;
     ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0));
 
     // OnLeftClick() can veto the button state change - for buttons which