X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6212a0cb7e6285f62198a9411d91bbe8dc06e60..47e175a24f862aa8b7ca7dd4a2bb5957991e7f2d:/src/osx/carbon/control.cpp diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp index 7f406f3a8b..eff5294e5b 100644 --- a/src/osx/carbon/control.cpp +++ b/src/osx/carbon/control.cpp @@ -73,7 +73,7 @@ bool wxControl::ProcessCommand( wxCommandEvent &event ) void wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) ) { - if ( m_peer == NULL || !m_peer->IsOk() ) + if ( GetPeer() == NULL || !GetPeer()->IsOk() ) return; #if wxOSX_USE_CARBON @@ -81,10 +81,10 @@ void wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) ) char charCode; GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); - GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode ); + GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode ); GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); - m_peer->HandleKey( keyCode, charCode, modifiers ); + GetPeer()->HandleKey( keyCode, charCode, modifiers ); #else // TODO #endif