Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

recognize ESC[APE] in menu accel strings (patch 733967)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-05-10 00:56:07 +00:00
parent a8fbc9cc57
commit 41b78190ad
2 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/latex/wx/menu.tex
View File

@@ -168,6 +168,7 @@ characters listed in the table below (again, case doesn't matter):
\twocolitem{{\tt END}}{End key} \twocolitem{{\tt END}}{End key}
\twocolitem{{\tt SPACE}}{Space} \twocolitem{{\tt SPACE}}{Space}
\twocolitem{{\tt TAB}}{Tab key} \twocolitem{{\tt TAB}}{Tab key}
\twocolitem{{\tt ESC} or {\tt ESCAPE}}{Escape key (Windows only)}
\end{twocollist} \end{twocollist}
\wxheading{See also} \wxheading{See also}

47
src/common/menucmn.cpp
View File

@@ -153,51 +153,38 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
else { else {
// several special cases // several special cases
current.MakeUpper(); current.MakeUpper();
if ( current == wxT("DEL") ) { if ( current == wxT("DEL") )
keyCode = WXK_DELETE; keyCode = WXK_DELETE;
} else if ( current == wxT("DELETE") )
else if ( current == wxT("DELETE") ) {
keyCode = WXK_DELETE; keyCode = WXK_DELETE;
} else if ( current == wxT("INS") )
else if ( current == wxT("INS") ) {
keyCode = WXK_INSERT; keyCode = WXK_INSERT;
} else if ( current == wxT("INSERT") )
else if ( current == wxT("INSERT") ) {
keyCode = WXK_INSERT; keyCode = WXK_INSERT;
} else if ( current == wxT("ENTER") || current == wxT("RETURN") )
else if ( current == wxT("ENTER") || current == wxT("RETURN") ) {
keyCode = WXK_RETURN; keyCode = WXK_RETURN;
} else if ( current == wxT("PGUP") )
else if ( current == wxT("PGUP") ) {
keyCode = WXK_PRIOR; keyCode = WXK_PRIOR;
} else if ( current == wxT("PGDN") )
else if ( current == wxT("PGDN") ) {
keyCode = WXK_NEXT; keyCode = WXK_NEXT;
} else if ( current == wxT("LEFT") )
else if ( current == wxT("LEFT") ) {
keyCode = WXK_LEFT; keyCode = WXK_LEFT;
} else if ( current == wxT("RIGHT") )
else if ( current == wxT("RIGHT") ) {
keyCode = WXK_RIGHT; keyCode = WXK_RIGHT;
} else if ( current == wxT("UP") )
else if ( current == wxT("UP") ) {
keyCode = WXK_UP; keyCode = WXK_UP;
} else if ( current == wxT("DOWN") )
else if ( current == wxT("DOWN") ) {
keyCode = WXK_DOWN; keyCode = WXK_DOWN;
} else if ( current == wxT("HOME") )
else if ( current == wxT("HOME") ) {
keyCode = WXK_HOME; keyCode = WXK_HOME;
} else if ( current == wxT("END") )
else if ( current == wxT("END") ) {
keyCode = WXK_END; keyCode = WXK_END;
} else if ( current == wxT("SPACE") )
else if ( current == wxT("SPACE") ) {
keyCode = WXK_SPACE; keyCode = WXK_SPACE;
} else if ( current == wxT("TAB") )
else if ( current == wxT("TAB") ) {
keyCode = WXK_TAB; keyCode = WXK_TAB;
} else if ( current == wxT("ESC") || current == wxT("ESCAPE") ) {
keyCode = WXK_ESCAPE;
else else
{ {
wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."), wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),