X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25eb6881f75dbbe252f7d6f4bcd0c142306655ca..4813bb8d72d4e6821e031f2b19baaa338b714d39:/src/mac/carbon/control.cpp

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index ef90b54ce0..f787ea9812 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
+// Name:        src/mac/carbon/control.cpp
 // Purpose:     wxControl class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,54 +12,57 @@
 #include "wx/wxprec.h"
 
 #include "wx/control.h"
-#include "wx/panel.h"
-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/panel.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/button.h"
+    #include "wx/dialog.h"
+    #include "wx/scrolbar.h"
+    #include "wx/stattext.h"
+    #include "wx/statbox.h"
+    #include "wx/radiobox.h"
+    #include "wx/sizer.h"
+#endif // WX_PRECOMP
+
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/radiobox.h"
 #include "wx/spinbutt.h"
-#include "wx/scrolbar.h"
-#include "wx/button.h"
-#include "wx/dialog.h"
-#include "wx/statbox.h"
-#include "wx/sizer.h"
-#include "wx/stattext.h"
-
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"
 
-// Item members
+IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+
 
 wxControl::wxControl()
 {
 }
 
-bool wxControl::Create(wxWindow *parent,
+bool wxControl::Create( wxWindow *parent,
        wxWindowID id,
        const wxPoint& pos,
        const wxSize& size,
        long style,
        const wxValidator& validator,
-       const wxString& name)
+       const wxString& name )
 {
-    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+    bool rval = wxWindow::Create( parent, id, pos, size, style, name );
 
 #if 0
     // no automatic inheritance as we most often need transparent backgrounds
     if ( parent )
     {
-        m_backgroundColour = parent->GetBackgroundColour() ;
-        m_foregroundColour = parent->GetForegroundColour() ;
+        m_backgroundColour = parent->GetBackgroundColour();
+        m_foregroundColour = parent->GetForegroundColour();
     }
 #endif
 
 #if wxUSE_VALIDATORS
-    if (rval) 
-        SetValidator(validator);
+    if (rval)
+        SetValidator( validator );
 #endif
 
     return rval;
@@ -70,26 +73,25 @@ wxControl::~wxControl()
     m_isBeingDeleted = true;
 }
 
-bool wxControl::ProcessCommand (wxCommandEvent & event)
+bool wxControl::ProcessCommand( wxCommandEvent &event )
 {
     // Tries:
     // 1) OnCommand, starting at this window and working up parent hierarchy
     // 2) OnCommand then calls ProcessEvent to search the event tables.
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent( event );
 }
 
-void  wxControl::OnKeyDown( wxKeyEvent &event ) 
+void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
 {
     if ( m_peer == NULL || !m_peer->Ok() )
-        return ;
+        return;
 
-    char charCode ;
-    UInt32 keyCode, modifiers ;
+    UInt32 keyCode, modifiers;
+    char charCode;
 
-    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(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode  );
+    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 ) ;
+    m_peer->HandleKey( keyCode, charCode, modifiers );
 }
-