solving include order problems for stl and xti

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

diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp
index 7f406f3a8bf86d4bc62b931d34f7654c8b4873bf..dba7a99689e242e6350078d57dfa260793c99e1a 100644 (file)
--- 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) )
 {
 
 void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
 {

-    if ( m_peer == NULL || !m_peer->IsOk() )
+    if ( GetPeer() == NULL || !GetPeer()->IsOk() )

         return;
 
 #if wxOSX_USE_CARBON
         return;
 
 #if wxOSX_USE_CARBON


@@ -84,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 );
 
     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
 #else
     // TODO
 #endif