adapting keycode field usage for EVT_CHAR in unicode to MSW variant (full unicode char)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
799181197d
commit
04bf2fb515
@ -1522,7 +1522,6 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
|
||||
wxKeyEvent event(wxEVT_CHAR) ;
|
||||
MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
|
||||
long keyval = event.m_keyCode ;
|
||||
short realkeyval = short(keymessage & charCodeMask) ;
|
||||
|
||||
bool handled = false ;
|
||||
|
||||
@ -1531,9 +1530,6 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
|
||||
if (tlw)
|
||||
{
|
||||
event.SetEventType( wxEVT_CHAR_HOOK );
|
||||
// send original character, not the uppercase version
|
||||
event.m_keyCode = realkeyval ;
|
||||
|
||||
handled = tlw->GetEventHandler()->ProcessEvent( event );
|
||||
if ( handled && event.GetSkipped() )
|
||||
handled = false ;
|
||||
@ -1669,6 +1665,8 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
|
||||
event.m_keyCode = keyval ;
|
||||
#if wxUSE_UNICODE
|
||||
event.m_uniChar = uniChar ;
|
||||
if ( event.GetEventType() == wxEVT_CHAR )
|
||||
event.m_keyCode = uniChar ;
|
||||
#endif
|
||||
|
||||
event.m_rawCode = keymessage;
|
||||
|
Loading…
Reference in New Issue
Block a user