X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d1a4878f36ba4b5f66c2ccfd2cb27a9dc528b6f..6eaa4426e06c03017b47beaf4235d9f079edf5fe:/src/mac/carbon/control.cpp

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 66c8c8f7c5..ef90b54ce0 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "control.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/control.h"
@@ -31,9 +27,7 @@
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
-#endif
 
 #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);
 
@@ -61,18 +57,17 @@ bool wxControl::Create(wxWindow *parent, wxWindowID id,
     }
 #endif
 
-    if (rval) 
-    {
 #if wxUSE_VALIDATORS
+    if (rval) 
         SetValidator(validator);
 #endif
-    }
+
     return rval;
 }
 
 wxControl::~wxControl()
 {
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
 }
 
 bool wxControl::ProcessCommand (wxCommandEvent & event)
@@ -87,14 +82,13 @@ void  wxControl::OnKeyDown( wxKeyEvent &event )
 {
     if ( m_peer == NULL || !m_peer->Ok() )
         return ;
-    
+
     char charCode ;
-    UInt32 keyCode ;    
-    UInt32 modifiers ;
+    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);
+    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 ) ;
 }