X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e7a89af32d371a2f90832f6e20d3da3ea1ce062..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/carbon/control.cpp?ds=sidebyside

diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp
index 00114ba89e..eff5294e5b 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
@@ -86,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