cleanup - reformat

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

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

-#ifdef __GNUG__
-#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 +27,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"


@@ -44,11 +38,13 @@ wxControl::wxControl()
 {
 }
 
 {
 }
 

-bool wxControl::Create(wxWindow *parent, wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size, long style,
-                       const wxValidator& validator,
-                       const wxString& name)
+bool wxControl::Create(wxWindow *parent,
+       wxWindowID id,
+       const wxPoint& pos,
+       const wxSize& size,
+       long style,
+       const wxValidator& validator,
+       const wxString& name)

 {
     bool rval = wxWindow::Create(parent, id, pos, size, style, name);
 
 {
     bool rval = wxWindow::Create(parent, id, pos, size, style, name);
 


@@ -61,18 +57,17 @@ bool wxControl::Create(wxWindow *parent, wxWindowID id,
     }
 #endif
 
     }
 #endif
 

-    if (rval) 
-    {

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

+    if (rval) 

         SetValidator(validator);
 #endif
         SetValidator(validator);
 #endif

-    }
+

     return rval;
 }
 
 wxControl::~wxControl()
 {
     return rval;
 }
 
 wxControl::~wxControl()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 }
 
 bool wxControl::ProcessCommand (wxCommandEvent & event)
 }
 
 bool wxControl::ProcessCommand (wxCommandEvent & event)


@@ -87,27 +82,14 @@ 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 ;
 
     char charCode ;

-    UInt32 keyCode ;    
-    UInt32 modifiers ;
-
-    GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
-    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
+    UInt32 keyCode, modifiers ;
+
+    GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL,&charCode );
+    GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode  );
+    GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
+
+    m_peer->HandleKey( keyCode , charCode , modifiers ) ;

 }
 
 }