X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..7ad25aed02fa53612cd94a422904667c46fafcbb:/src/mac/carbon/control.cpp

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 8f7163487b..ef90b54ce0 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -38,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);
 
@@ -55,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)
@@ -81,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 ) ;
 }