X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21fd55291b631eae9ccfd78866616aca6e573ebe..e11898f903183f897a2b2a50a4447ea73ba7273f:/src/mac/carbon/control.cpp?ds=sidebyside diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 39f3a344d2..e7fa4ffe52 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -88,8 +88,6 @@ void wxControl::OnKeyDown( wxKeyEvent &event ) if ( m_peer == NULL || !m_peer->Ok() ) return ; -#if TARGET_CARBON - char charCode ; UInt32 keyCode ; UInt32 modifiers ; @@ -98,16 +96,6 @@ void wxControl::OnKeyDown( wxKeyEvent &event ) GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter((EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); - ::HandleControlKey( *m_peer , keyCode , charCode , modifiers ) ; - -#else - EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ; - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - - ::HandleControlKey( *m_peer , keycode , keychar , ev->modifiers ) ; -#endif + m_peer->HandleKey( keyCode , charCode , modifiers ) ; }