compilation fix; unTABbed

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 39f3a344d2072de468465bac34b38db0f7b58ad1..2fc1cfed14b0cf388ae378dee902aacd7eb0974b 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -9,11 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #include "wx/control.h"
 #include "wx/panel.h"
 
 #include "wx/control.h"
 #include "wx/panel.h"


@@ -31,9 +31,7 @@
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)

-#endif

 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"


@@ -88,8 +86,6 @@ void  wxControl::OnKeyDown( wxKeyEvent &event )
     if ( m_peer == NULL || !m_peer->Ok() )
         return ;
     
     if ( m_peer == NULL || !m_peer->Ok() )
         return ;
     

-#if TARGET_CARBON
-

     char charCode ;
     UInt32 keyCode ;    
     UInt32 modifiers ;
     char charCode ;
     UInt32 keyCode ;    
     UInt32 modifiers ;


@@ -98,16 +94,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);
 
     GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL,  sizeof(UInt32), NULL, &keyCode );
        GetEventParameter((EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
 

-    ::HandleControlKey( *m_peer , 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( *m_peer , keycode , keychar , ev->modifiers ) ;
-#endif
+    m_peer->HandleKey( keyCode , charCode , modifiers ) ;

 }
 
 }