X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..0bd3b8eca1d6ef2749797f34216493fce0edd8d6:/src/mac/carbon/control.cpp

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 297d1a73b5..e7fa4ffe52 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -85,11 +85,9 @@ bool wxControl::ProcessCommand (wxCommandEvent & event)
 
 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {
-    if ( (ControlRef) m_macControl == NULL )
+    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( (ControlRef) m_macControl , 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( (ControlRef) m_macControl , keycode , keychar , ev->modifiers ) ;
-#endif
+    m_peer->HandleKey( keyCode , charCode , modifiers ) ;
 }