use GtkIMContext variable, not GtkIMMulticontext, we don't use functions that take...

[wxWidgets.git] / src / mac / carbon / control.cpp

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index ba7d6a7a3cee2c0c8619c3e280bff04949b27fc8..39f3a344d2072de468465bac34b38db0f7b58ad1 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -85,7 +85,7 @@ bool wxControl::ProcessCommand (wxCommandEvent & event)
 
 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {
 
 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {

-    if ( (ControlRef) m_macControl == NULL )
+    if ( m_peer == NULL || !m_peer->Ok() )

         return ;
     
 #if TARGET_CARBON
         return ;
     
 #if TARGET_CARBON


@@ -98,7 +98,7 @@ 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);
 
     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 ) ;
+    ::HandleControlKey( *m_peer , keyCode , charCode , modifiers ) ;

     
 #else
     EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
     
 #else
     EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;


@@ -107,7 +107,7 @@ void  wxControl::OnKeyDown( wxKeyEvent &event )
     keychar = short(ev->message & charCodeMask);
     keycode = short(ev->message & keyCodeMask) >> 8 ;
 
     keychar = short(ev->message & charCodeMask);
     keycode = short(ev->message & keyCodeMask) >> 8 ;
 

-    ::HandleControlKey( (ControlRef) m_macControl , keycode , keychar , ev->modifiers ) ;
+    ::HandleControlKey( *m_peer , keycode , keychar , ev->modifiers ) ;

 #endif
 }
 
 #endif
 }