X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e7a89af32d371a2f90832f6e20d3da3ea1ce062..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/osx/carbon/control.cpp diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp index 00114ba89e..dba7a99689 100644 --- a/src/osx/carbon/control.cpp +++ b/src/osx/carbon/control.cpp @@ -63,11 +63,6 @@ bool wxControl::Create( wxWindow *parent, return rval; } -wxControl::~wxControl() -{ - m_isBeingDeleted = true; -} - bool wxControl::ProcessCommand( wxCommandEvent &event ) { // Tries: @@ -78,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 @@ -89,7 +84,7 @@ void wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) ) GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), 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