From 4ccc303a24e383fbbebf790a7d7809e098b4a47f Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 21 Aug 2002 16:05:37 +0000 Subject: [PATCH] centralized key handling git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/toplevel.cpp | 12 +----------- src/mac/toplevel.cpp | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 0572ffc79a..d2e8ee8509 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -233,18 +233,8 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef case kEventClassTextInput : if ( wxMacConvertEventToRecord( event , &rec ) ) { - short keycode ; - short keychar ; - keychar = short(rec.message & charCodeMask); - keycode = short(rec.message & keyCodeMask) >> 8 ; wxWindow* focus = wxWindow::FindFocus() ; - // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value - if ( (rec.modifiers & controlKey) && keychar >= 0 && keychar < 0x20 ) - { - keychar += 0x40 ; - } - long keyval = wxMacTranslateKey(keychar, keycode) ; - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , keyval , rec.modifiers , rec.when , rec.where.h , rec.where.v ) ) + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , rec.message , rec.modifiers , rec.when , rec.where.h , rec.where.v ) ) { // was handled internally result = noErr ; diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index 0572ffc79a..d2e8ee8509 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -233,18 +233,8 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef case kEventClassTextInput : if ( wxMacConvertEventToRecord( event , &rec ) ) { - short keycode ; - short keychar ; - keychar = short(rec.message & charCodeMask); - keycode = short(rec.message & keyCodeMask) >> 8 ; wxWindow* focus = wxWindow::FindFocus() ; - // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value - if ( (rec.modifiers & controlKey) && keychar >= 0 && keychar < 0x20 ) - { - keychar += 0x40 ; - } - long keyval = wxMacTranslateKey(keychar, keycode) ; - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , keyval , rec.modifiers , rec.when , rec.where.h , rec.where.v ) ) + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , rec.message , rec.modifiers , rec.when , rec.where.h , rec.where.v ) ) { // was handled internally result = noErr ; -- 2.45.2