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
This commit is contained in:
@@ -217,6 +217,14 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
|
|||||||
"button labels never use accelerators" );
|
"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) )
|
if ( !(flags & wxSTOCK_WITH_MNEMONIC) )
|
||||||
{
|
{
|
||||||
stockLabel = wxStripMenuCodes(stockLabel);
|
stockLabel = wxStripMenuCodes(stockLabel);
|
||||||
|
Reference in New Issue
Block a user