From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Jul 2009 16:41:33 +0000 (+0000)
Subject: Don't use mnemonic for Cancel button under MSW.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9b26a198ce442caff6a46196b97d25e60e1193f0

Don't use mnemonic for Cancel button under MSW.

Native dialogs don't, so we shouldn't neither.

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

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index bf218c5fce..28d720a047 100644
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -217,6 +217,14 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
                         "button labels never use accelerators" );
     }
 
+#ifdef __WXMSW__
+    // special case: the "Cancel" button shouldn't have a mnemonic under MSW
+    // for consistency with the native dialogs (which don't use any mnemonic
+    // for it because it is already bound to Esc implicitly)
+    if ( id == wxID_CANCEL )
+        flags &= ~wxSTOCK_WITH_MNEMONIC;
+#endif // __WXMSW__
+
     if ( !(flags & wxSTOCK_WITH_MNEMONIC) )
     {
         stockLabel = wxStripMenuCodes(stockLabel);