From 04bf2fb51514e3ec8631a1d8ea1f610fca851005 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 27 Jan 2006 17:04:15 +0000 Subject: [PATCH] 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 --- src/mac/carbon/app.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index e079f74d5c..3e1b8065fc 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -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;