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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/menucmn.cpp
View File

@@ -159,14 +159,39 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
else if ( current == wxT("INSERT") ) {
keyCode = WXK_INSERT;
}
#if 0
else if ( current == wxT("ENTER") || current == wxT("RETURN") ) {
keyCode = WXK_RETURN;
}
else if ( current == wxT("PGUP") ) {
keyCode = VK_PRIOR;
keyCode = WXK_PRIOR;
}
else if ( current == wxT("PGDN") ) {
keyCode = VK_NEXT;
keyCode = WXK_NEXT;
}
else if ( current == wxT("LEFT") ) {
keyCode = WXK_LEFT;
}
else if ( current == wxT("RIGHT") ) {
keyCode = WXK_RIGHT;
}
else if ( current == wxT("UP") ) {
keyCode = WXK_UP;
}
else if ( current == wxT("DOWN") ) {
keyCode = WXK_DOWN;
}
else if ( current == wxT("HOME") ) {
keyCode = WXK_HOME;
}
else if ( current == wxT("END") ) {
keyCode = WXK_END;
}
else if ( current == wxT("SPACE") ) {
keyCode = WXK_SPACE;
}
else if ( current == wxT("TAB") ) {
keyCode = WXK_TAB;
}
#endif
else
{
wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
@@ -789,7 +814,7 @@ int wxMenuBarBase::FindMenu(const wxString& title) const
(wxMenuItem::GetLabelFromText(title2) == label) )
{
// found
return (int)i;
return (int)i;
}
}