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

wxToupper added again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-08-24 07:40:45 +00:00
parent 0326d9689e
commit b96a8bdb60
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mac/app.cpp
View File

@@ -1844,8 +1844,9 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
long realkeyval = keyval ; long realkeyval = keyval ;
if ( keyval == keychar ) if ( keyval == keychar )
{ {
// we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
realkeyval = short(keymessage & charCodeMask) ; realkeyval = short(keymessage & charCodeMask) ;
keyval = wxToupper( keyval ) ;
} }
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
@@ -1986,6 +1987,10 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
} }
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
if ( keyval == keychar )
{
keyval = wxToupper( keyval ) ;
}
bool handled = false ; bool handled = false ;
wxKeyEvent event(wxEVT_KEY_UP); wxKeyEvent event(wxEVT_KEY_UP);

7
src/mac/carbon/app.cpp
View File

@@ -1844,8 +1844,9 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
long realkeyval = keyval ; long realkeyval = keyval ;
if ( keyval == keychar ) if ( keyval == keychar )
{ {
// we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
realkeyval = short(keymessage & charCodeMask) ; realkeyval = short(keymessage & charCodeMask) ;
keyval = wxToupper( keyval ) ;
} }
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
@@ -1986,6 +1987,10 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
} }
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
if ( keyval == keychar )
{
keyval = wxToupper( keyval ) ;
}
bool handled = false ; bool handled = false ;
wxKeyEvent event(wxEVT_KEY_UP); wxKeyEvent event(wxEVT_KEY_UP);