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

second merge of the 2.2 branch (RL)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/utilscmn.cpp
View File

@@ -498,20 +498,29 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
keyCode = WXK_F1 + n - 1;
}
else {
#if 0 // this is not supported by GTK+, apparently
// several special cases
current.MakeUpper();
if ( current == wxT("DEL") ) {
keyCode = VK_DELETE;
keyCode = WXK_DELETE;
}
else if ( current == wxT("DELETE") ) {
keyCode = WXK_DELETE;
}
else if ( current == wxT("INS") ) {
keyCode = WXK_INSERT;
}
else if ( current == wxT("INSERT") ) {
keyCode = WXK_INSERT;
}
#if 0
else if ( current == wxT("PGUP") ) {
keyCode = VK_PRIOR;
}
else if ( current == wxT("PGDN") ) {
keyCode = VK_NEXT;
}
#endif
else
#endif // 0
{
wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
current.c_str());
@@ -878,10 +887,13 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
return wxYES;
case wxID_NO:
return wxNO;
default:
case wxID_CANCEL:
return wxCANCEL;
}
wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") );
return wxCANCEL;
}
#if wxUSE_TEXTDLG