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

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

diff --git a/docs/latex/wx/menu.tex b/docs/latex/wx/menu.tex
index 20469ee2cbd5bb01b60b7de41d771409d211ba3d..c18f5e60b0d33f3be08089ba5fdf4d96b1f74b1c 100644 (file)
--- a/docs/latex/wx/menu.tex
+++ b/docs/latex/wx/menu.tex
@@ -168,6 +168,7 @@ characters listed in the table below (again, case doesn't matter):
 \twocolitem{{\tt END}}{End key}
 \twocolitem{{\tt SPACE}}{Space}
 \twocolitem{{\tt TAB}}{Tab key}
 \twocolitem{{\tt END}}{End key}
 \twocolitem{{\tt SPACE}}{Space}
 \twocolitem{{\tt TAB}}{Tab key}

+\twocolitem{{\tt ESC} or {\tt ESCAPE}}{Escape key (Windows only)}

 \end{twocollist}
 
 \wxheading{See also}
 \end{twocollist}
 
 \wxheading{See also}

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 5574a19cbb086de28941fffd9ce3845113b88bf2..5b224a1ddfb4b04777625082546acbf468900aa4 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -153,51 +153,38 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                 else {
                     // several special cases
                     current.MakeUpper();
                 else {
                     // several special cases
                     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
                     {
                         wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
                     else
                     {
                         wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),