centralized key handling

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 0572ffc79a21f28628944b308fcb38bb2b1dd739..d2e8ee850978fde0e7018f20dcc6260b794f74f8 100644 (file)
--- 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 ) )
             {
         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() ;
                 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 ;
                 {
                     // was handled internally
                     result = noErr ;

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 0572ffc79a21f28628944b308fcb38bb2b1dd739..d2e8ee850978fde0e7018f20dcc6260b794f74f8 100644 (file)
--- 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 ) )
             {
         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() ;
                 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 ;
                 {
                     // was handled internally
                     result = noErr ;