Remove hard TABs and trailing spaces

no real changes

src/gtk/dc.cpp

@@ -153,7 +153,7 @@ bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dst
     // surface and use this copy in the drawing operations.
     if ( cr == cr_src )
     {
-	// Check if destination and source regions overlap.
+        // Check if destination and source regions overlap.
         // If necessary, copy source surface to the temporary one.
         if (wxRect(xdest, ydest, dstWidth, dstHeight)
             .Intersects(wxRect(xsrc, ysrc, srcWidth, srcHeight)))
@@ -221,7 +221,7 @@ bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dst
     cairo_restore(cr);
     if ( surfaceTmp )
     {
-	cairo_surface_destroy(surfaceTmp);
+        cairo_surface_destroy(surfaceTmp);
     }
     m_logicalFunction = rop_save;
     return true;

src/msw/statbox.cpp

@@ -510,10 +510,10 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
     ::GetClientRect(GetHwnd(), &rc);
     wxPaintDC dc(this);
 
-	// No need to do anything if the client rectangle is empty and, worse,
+    // No need to do anything if the client rectangle is empty and, worse,
     // doing it would result in an assert when creating the bitmap below.
-	if ( !rc.right || !rc.bottom )
+    if ( !rc.right || !rc.bottom )
-		return;
+        return;
 
     // draw the entire box in a memory DC
     wxMemoryDC memdc(&dc);

src/osx/carbon/renderer.cpp

@@ -44,7 +44,7 @@
 inline bool wxHasCGContext(wxWindow* WXUNUSED(win), wxDC& dc)
 {
     wxGCDCImpl* gcdc = wxDynamicCast( dc.GetImpl() , wxGCDCImpl);
-    
+
     if ( gcdc )
     {
         if ( gcdc->GetGraphicsContext()->GetNativeContext() )
@@ -218,7 +218,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
             {
                 drawInfo.value = kThemeButtonOn;
             }
-            
+
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
         }
     }
@@ -730,22 +730,22 @@ void wxRendererMac::DrawTitleBarBitmap(wxWindow *win,
         drawCircle = false;
         glyphColor = wxColour(145, 147, 149);
     }
-    
+
     if ( drawCircle )
     {
         wxRect circleRect(rect);
         circleRect.Deflate(2);
-    
+
         dc.DrawEllipse(circleRect);
     }
-    
+
     dc.SetPen(wxPen(glyphColor, 1));
-    
+
     wxRect centerRect(rect);
     centerRect.Deflate(5);
     centerRect.height++;
     centerRect.width++;
-	
+
     dc.DrawLine(centerRect.GetTopLeft(), centerRect.GetBottomRight());
     dc.DrawLine(centerRect.GetTopRight(), centerRect.GetBottomLeft());
 }

src/osx/cocoa/listbox.mm

@@ -145,7 +145,7 @@ public :
 
     virtual void            controlDoubleAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE;
 
-    
+
 protected :
     wxNSTableView*          m_tableView ;
 
@@ -293,9 +293,9 @@ protected:
 - (void) tableViewSelectionDidChange: (NSNotification *) notification
 {
     wxUnusedVar(notification);
-    
+
     int row = [self selectedRow];
-    
+
     if (row == -1) 
     {
         // no row selected
@@ -305,14 +305,14 @@ protected:
         wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
         wxListBox *list = static_cast<wxListBox*> ( impl->GetWXPeer());
         wxCHECK_RET( list != NULL , wxT("Listbox expected"));
-        
+
         if ((row < 0) || (row > (int) list->GetCount()))  // OS X can select an item below the last item
             return;
-        
+
         if ( !list->MacGetBlockEvents() )
             list->HandleLineEvent( row, false );
     }
-    
+
 } 
 
 - (void)setFont:(NSFont *)aFont
@@ -388,11 +388,11 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const
         [col1 setWidth:1000];
     }
     [col1 setResizingMask: NSTableColumnAutoresizingMask];
-    
+
     wxListBox *list = static_cast<wxListBox*> ( GetWXPeer());
     if ( list != NULL )
         [[col1 dataCell] setFont:list->GetFont().OSXGetNSFont()];
-    
+
     wxCocoaTableColumn* wxcol = new wxCocoaTableColumn( col1, editable );
     [col1 setColumn:wxcol];
 
@@ -412,30 +412,30 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , con
     [checkbox setTitle:@""];
     [checkbox setButtonType:NSSwitchButton];
     [col1 setDataCell:checkbox] ;
-    
+
     wxListBox *list = static_cast<wxListBox*> ( GetWXPeer());
     if ( list != NULL )
     {
         NSControlSize size = NSRegularControlSize;
-        
+
         switch ( list->GetWindowVariant() )
         {
             case wxWINDOW_VARIANT_NORMAL :
                 size = NSRegularControlSize;
                 break ;
-                
+
             case wxWINDOW_VARIANT_SMALL :
                 size = NSSmallControlSize;
                 break ;
-                
+
             case wxWINDOW_VARIANT_MINI :
                 size = NSMiniControlSize;
                 break ;
-                
+
             case wxWINDOW_VARIANT_LARGE :
                 size = NSRegularControlSize;
                 break ;
-                
+
             default:
                 break ;
         }
@@ -502,7 +502,7 @@ void wxListWidgetCocoaImpl::ListSetSelection( unsigned int n, bool select, bool
     // TODO
     if ( select )
         [m_tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:n]
-		     byExtendingSelection:multi];
+             byExtendingSelection:multi];
     else
         [m_tableView deselectRow: n];
 

src/osx/cocoa/mediactrl.mm

@@ -60,7 +60,7 @@ static void *AVSPPlayerItemStatusContext = &AVSPPlayerItemStatusContext;
 static void *AVSPPlayerRateContext = &AVSPPlayerRateContext;
 
 @interface wxAVPlayer : AVPlayer {
-    
+
     AVPlayerLayer *playerLayer;
 
     wxAVMediaBackend* m_backend;
@@ -75,10 +75,10 @@ static void *AVSPPlayerRateContext = &AVSPPlayerRateContext;
 class WXDLLIMPEXP_MEDIA wxAVMediaBackend : public wxMediaBackendCommonBase
 {
 public:
-    
+
     wxAVMediaBackend();
     ~wxAVMediaBackend();
-    
+
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                wxWindowID id,
                                const wxPoint& pos,
@@ -86,41 +86,41 @@ public:
                                long style,
                                const wxValidator& validator,
                                const wxString& name) wxOVERRIDE;
-    
+
     virtual bool Play() wxOVERRIDE;
     virtual bool Pause() wxOVERRIDE;
     virtual bool Stop() wxOVERRIDE;
-    
+
     virtual bool Load(const wxString& fileName) wxOVERRIDE;
     virtual bool Load(const wxURI& location) wxOVERRIDE;
-    
+
     virtual wxMediaState GetState() wxOVERRIDE;
-    
+
     virtual bool SetPosition(wxLongLong where) wxOVERRIDE;
     virtual wxLongLong GetPosition() wxOVERRIDE;
     virtual wxLongLong GetDuration() wxOVERRIDE;
-    
+
     virtual void Move(int x, int y, int w, int h) wxOVERRIDE;
     wxSize GetVideoSize() const wxOVERRIDE;
-    
+
     virtual double GetPlaybackRate() wxOVERRIDE;
     virtual bool SetPlaybackRate(double dRate) wxOVERRIDE;
-    
+
     virtual double GetVolume() wxOVERRIDE;
     virtual bool SetVolume(double dVolume) wxOVERRIDE;
-    
+
     void Cleanup();
     void FinishLoad();
-    
+
     virtual bool   ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE;
 private:
     void DoShowPlayerControls(wxMediaCtrlPlayerControls flags);
-    
+
     wxSize m_bestSize;              //Original movie size
     wxAVPlayer* m_player;               //AVPlayer handle/instance
-    
+
     wxMediaCtrlPlayerControls m_interfaceflags; // Saved interface flags
-    
+
     wxDECLARE_DYNAMIC_CLASS(wxAVMediaBackend);
 };
 
@@ -146,19 +146,19 @@ private:
 
 - (void)dealloc
 {
-	[playerLayer release];
+    [playerLayer release];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    
+
     [self removeObserver:self forKeyPath:@"rate" context:AVSPPlayerRateContext];
-	[self removeObserver:self forKeyPath:@"currentItem.status" context:AVSPPlayerItemStatusContext];
+    [self removeObserver:self forKeyPath:@"currentItem.status" context:AVSPPlayerItemStatusContext];
-	
+
-	[super dealloc];
+    [super dealloc];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
-	if (context == AVSPPlayerItemStatusContext)
+    if (context == AVSPPlayerItemStatusContext)
-	{
+    {
         id val = [change objectForKey:NSKeyValueChangeNewKey];
         if ( val != [NSNull null ] )
         {
@@ -180,10 +180,10 @@ private:
                     break;
             }
         }
-	}
+    }
-	else if (context == AVSPPlayerRateContext)
+    else if (context == AVSPPlayerRateContext)
-	{
+    {
-		NSNumber* newRate = [change objectForKey:NSKeyValueChangeNewKey];
+        NSNumber* newRate = [change objectForKey:NSKeyValueChangeNewKey];
         if ([newRate intValue] == 0)
         {
             m_backend->QueuePauseEvent();
@@ -192,11 +192,11 @@ private:
         {
             m_backend->QueuePlayEvent();
         }
-	}
+    }
-	else
+    else
-	{
+    {
-		[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-	}
+    }
 }
 
 -(wxAVMediaBackend*) backend
@@ -220,12 +220,12 @@ private:
 
 -(BOOL)isPlaying
 {
-	if ([self rate] == 0)
+    if ([self rate] == 0)
-	{
+    {
-		return NO;
+        return NO;
-	}
+    }
-	
+
-	return YES;
+    return YES;
 }
 
 @end
@@ -252,7 +252,7 @@ private:
 
 + (Class)layerClass
 {
-	return [AVPlayerLayer class];
+    return [AVPlayerLayer class];
 }
 
 - (id) initWithFrame:(CGRect)rect player:(wxAVPlayer*) player
@@ -342,7 +342,7 @@ private:
         [playerlayer setAutoresizingMask:kCALayerWidthSizable | kCALayerHeightSizable];
         [[self layer] addSublayer:playerlayer];
     }
-    
+
     return self;
 }
 
@@ -377,9 +377,9 @@ bool wxAVMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
                                      const wxString& name)
 {
     wxMediaCtrl* mediactrl = (wxMediaCtrl*) inctrl;
-    
+
     mediactrl->DontCreatePeer();
-    
+
     if ( !mediactrl->wxControl::Create(
                                        parent, wid, pos, size,
                                        wxWindow::MacRemoveBordersFromStyle(style),
@@ -392,7 +392,7 @@ bool wxAVMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
     [m_player setBackend:this];
 
     WXRect r = wxOSXGetFrameForControl( mediactrl, pos , size ) ;
-    
+
     WXWidget view = NULL;
 #if wxOSX_USE_AVKIT
     if ( NSClassFromString(@"AVPlayerView") )
@@ -401,12 +401,12 @@ bool wxAVMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
         [(wxAVPlayerView*) view setControlsStyle:AVPlayerViewControlsStyleNone];
     }
 #endif
-    
+
     if ( view == NULL )
     {
         view = [[wxAVView alloc] initWithFrame: r player:m_player];
     }
-    
+
 #if wxOSX_USE_IPHONE
     wxWidgetIPhoneImpl* impl = new wxWidgetIPhoneImpl(mediactrl,view);
 #else
@@ -431,16 +431,16 @@ bool wxAVMediaBackend::Load(const wxURI& location)
 {
     wxCFStringRef uri(location.BuildURI());
     NSURL *url = [NSURL URLWithString: uri.AsNSString()];
-    
+
     AVAsset* asset = [AVAsset assetWithURL:url];
     if (! asset )
         return false;
-    
+
     if ( [asset isPlayable] )
     {
         AVPlayerItem *playerItem = [AVPlayerItem playerItemWithAsset:asset];
         [m_player replaceCurrentItemWithPlayerItem:playerItem];
-    
+
         return playerItem != nil;
     }
     return false;
@@ -449,12 +449,12 @@ bool wxAVMediaBackend::Load(const wxURI& location)
 void wxAVMediaBackend::FinishLoad()
 {
     DoShowPlayerControls(m_interfaceflags);
-    
+
     AVPlayerItem *playerItem = [m_player currentItem];
-	
+
     CGSize s = [playerItem presentationSize];
     m_bestSize = wxSize(s.width, s.height);
-    
+
     NotifyMovieLoaded();
 }
 
@@ -500,7 +500,7 @@ bool wxAVMediaBackend::SetPlaybackRate(double dRate)
 
 bool wxAVMediaBackend::SetPosition(wxLongLong where)
 {
-	[m_player seekToTime:CMTimeMakeWithSeconds(where.GetValue() / 1000.0, 1)
+    [m_player seekToTime:CMTimeMakeWithSeconds(where.GetValue() / 1000.0, 1)
               toleranceBefore:kCMTimeZero toleranceAfter:kCMTimeZero];
 
     return true;
@@ -514,11 +514,11 @@ wxLongLong wxAVMediaBackend::GetPosition()
 wxLongLong wxAVMediaBackend::GetDuration()
 {
     AVPlayerItem *playerItem = [m_player currentItem];
-	
+
-	if ([playerItem status] == AVPlayerItemStatusReadyToPlay)
+    if ([playerItem status] == AVPlayerItemStatusReadyToPlay)
-		return CMTimeGetSeconds([[playerItem asset] duration])*1000.0;
+        return CMTimeGetSeconds([[playerItem asset] duration])*1000.0;
-	else
+    else
-		return 0.f;
+        return 0.f;
 }
 
 wxMediaState wxAVMediaBackend::GetState()
@@ -555,7 +555,7 @@ bool wxAVMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 {
     if ( m_interfaceflags != flags )
         DoShowPlayerControls(flags);
-    
+
     m_interfaceflags = flags;
     return true;
 }

src/osx/iphone/textctrl.mm

@@ -238,8 +238,7 @@ protected :
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 {
     wxUnusedVar(textField);
-    
+
-    
     return NO;
 }
 
@@ -317,7 +316,7 @@ wxUITextViewControl::wxUITextViewControl( wxTextCtrl *wxPeer, UITextView* v) :
 {
     m_textView = v;
     m_delegate= [[wxUITextViewDelegate alloc] init];
-    
+
     [m_textView setDelegate:m_delegate];
 }
 
@@ -423,7 +422,7 @@ void wxUITextViewControl::WriteText(const wxString& str)
     wxString st = str;
     wxMacConvertNewlines10To13( &st );
     wxMacEditHelper helper(m_textView);
-    
+
     wxCFStringRef insert( st , m_wxPeer->GetFont().GetEncoding() );
     NSMutableString* subst = [NSMutableString stringWithString:[m_textView text]];
     [subst replaceCharactersInRange:[m_textView selectedRange] withString:insert.AsNSString()];
@@ -466,10 +465,10 @@ bool wxUITextViewControl::GetStyle(long position, wxTextAttr& style)
         /*
         if (font)
             style.SetFont(wxFont(font));
-        
+
         if (bgcolor)
             style.SetBackgroundColour(wxColour(bgcolor));
-            
+
         if (fgcolor)
             style.SetTextColour(wxColour(fgcolor));
         */
@@ -489,15 +488,15 @@ void wxUITextViewControl::SetStyle(long start,
             range = [m_textView selectedRange];
 /*
         UITextStorage* storage = [m_textView textStorage];
-        
+
         wxFont font = style.GetFont();
         if (style.HasFont() && font.IsOk())
             [storage addAttribute:NSFontAttributeName value:font.OSXGetNSFont() range:range];
-        
+
         wxColour bgcolor = style.GetBackgroundColour();
         if (style.HasBackgroundColour() && bgcolor.IsOk())
             [storage addAttribute:NSBackgroundColorAttributeName value:bgcolor.OSXGetNSColor() range:range];
-        
+
         wxColour fgcolor = style.GetTextColour();
         if (style.HasTextColour() && fgcolor.IsOk())
             [storage addAttribute:NSForegroundColorAttributeName value:fgcolor.OSXGetNSColor() range:range];
@@ -512,9 +511,9 @@ void wxUITextViewControl::CheckSpelling(bool check)
 wxSize wxUITextViewControl::GetBestSize() const
 {
     wxRect r;
-    
+
     GetBestRect(&r);
-    
+
     /*
     if (m_textView && [m_textView layoutManager])
     {
@@ -526,7 +525,7 @@ wxSize wxUITextViewControl::GetBestSize() const
     }
     return wxSize(0,0);
     */
-    
+
     wxSize sz = r.GetSize();
     if ( sz.y < 31 )
         sz.y = 31;
@@ -571,7 +570,7 @@ void wxUITextFieldControl::SetStringValue( const wxString &str)
 wxSize wxUITextFieldControl::GetBestSize() const
 {
     wxRect r;
-    
+
     GetBestRect(&r);
     wxSize sz = r.GetSize();
     if ( sz.y < 31 )
@@ -605,7 +604,7 @@ void wxUITextFieldControl::SetEditable(bool editable)
         if ( !editable ) {
             [m_textField resignFirstResponder];
         }
-        
+
         [m_textField setEnabled: editable];
     }
 }
@@ -710,7 +709,7 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
         UITextView * v = nil;
         v = [[UITextView alloc] initWithFrame:r];
         tv = v;
-        
+
         wxUITextViewControl* tc = new wxUITextViewControl( wxpeer, v );
         c = tc;
         t = tc;
@@ -721,39 +720,39 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
         wxUITextField* v = [[wxUITextField alloc] initWithFrame:r];
         tv = v;
 
-		v.textColor = [UIColor blackColor];
+        v.textColor = [UIColor blackColor];
-		v.font = [UIFont systemFontOfSize:17.0];
+        v.font = [UIFont systemFontOfSize:17.0];
-		v.backgroundColor = [UIColor whiteColor];
+        v.backgroundColor = [UIColor whiteColor];
-		
+
-		v.clearButtonMode = UITextFieldViewModeNever;
+        v.clearButtonMode = UITextFieldViewModeNever;
-		
+
         [v setBorderStyle:UITextBorderStyleBezel];
         if ( style & wxNO_BORDER )
             v.borderStyle = UITextBorderStyleNone;
-         
+
         wxUITextFieldControl* tc = new wxUITextFieldControl( wxpeer, v );
         c = tc;
         t = tc;
     }
 #endif
-    
+
     if ( style & wxTE_PASSWORD )
         [tv setSecureTextEntry:YES];
-    
+
     if ( style & wxTE_CAPITALIZE )
         [tv setAutocapitalizationType:UITextAutocapitalizationTypeWords];
     else
         [tv setAutocapitalizationType:UITextAutocapitalizationTypeSentences];
-    
+
     if ( !(style & wxTE_MULTILINE) )
     {
         [tv setAutocorrectionType:UITextAutocorrectionTypeNo];
-		[tv setReturnKeyType:UIReturnKeyDone];
+        [tv setReturnKeyType:UIReturnKeyDone];
     }
     [tv setKeyboardType:UIKeyboardTypeDefault];
-    
+
     t->SetStringValue(str);
-    
+
     return c;
 }
 

src/osx/iphone/utils.mm

@@ -68,7 +68,7 @@
 }
 
 - (void)dealloc {
-	[super dealloc];
+    [super dealloc];
 }
 
 

src/osx/window_osx.cpp

@@ -221,7 +221,7 @@ void wxWindowMac::Init()
 wxWindowMac::~wxWindowMac()
 {
     SendDestroyEvent();
-    
+
 #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
     for ( int i = s_hotkeys.size()-1; i>=0; -- i )
     {
@@ -310,10 +310,10 @@ void wxWindowMac::SetWrappingPeer(wxOSXWidgetImpl* wrapper)
     wxOSXWidgetImpl* inner = GetPeer();
     wxASSERT_MSG( inner != NULL && inner->IsOk(), "missing or incomplete inner peer" );
     wxASSERT_MSG( wrapper != NULL && wrapper->IsOk(), "missing or incomplete wrapper" );
-    
+
     if ( !(inner != NULL && inner->IsOk() && wrapper != NULL && wrapper->IsOk()) )
         return;
-    
+
     inner->RemoveFromParent();
     wrapper->InstallEventHandler();
     wrapper->Embed(inner);
@@ -334,28 +334,28 @@ void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer)
     if ( GetPeer() && !GetPeer()->IsRootControl())
     {
         wxASSERT_MSG( GetPeer()->IsOk() , wxT("The native control must exist already") ) ;
-        
+
         if (!GetParent()->GetChildren().Find((wxWindow*)this))
             GetParent()->AddChild( this );
-        
+
         GetPeer()->InstallEventHandler();
         GetPeer()->Embed(GetParent()->GetPeer());
-        
+
         GetParent()->MacChildAdded() ;
-        
+
         // adjust font, controlsize etc
         GetPeer()->SetControlSize( m_windowVariant );
         InheritAttributes();
         // in case nothing has been set, use the variant default fonts
         if ( !m_hasFont )
             DoSetWindowVariant( m_windowVariant );
-        
+
         GetPeer()->SetInitialLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
-        
+
         // for controls we want to use best size for wxDefaultSize params )
         if ( !GetPeer()->IsUserPane() )
             SetInitialSize(GetMinSize());
-        
+
         SetCursor( *wxSTANDARD_CURSOR ) ;
     }
 }
@@ -859,16 +859,16 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
         // we shouldn't return invalid width
         if ( ww < 0 )
             ww = 0;
-        
+
         *x = ww;
     }
-    
+
     if (y)
     {
         // we shouldn't return invalid height
         if ( hh < 0 )
             hh = 0;
-        
+
         *y = hh;
     }
 }
@@ -1244,7 +1244,7 @@ bool wxWindowMac::Show(bool show)
 {
     if ( !show )
         MacInvalidateBorders();
-    
+
     if ( !wxWindowBase::Show(show) )
         return false;
 
@@ -1375,7 +1375,7 @@ void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
 
     if ( !IsShownOnScreen() )
         return ;
-    
+
     if ( IsFrozen() )
         return;
 
@@ -1999,7 +1999,7 @@ bool wxWindowMac::MacDoRedraw( long time )
     wxNonOwnedWindow* top = MacGetTopLevelWindow();
     if (top)
         top->WindowWasPainted() ;
-    
+
     return handled;
 }
 
@@ -2302,14 +2302,14 @@ long wxWindowMac::MacGetLeftBorderSize() const
 {
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
- 
+
     if ( GetPeer() )
     {
         int left, top, right, bottom;
         GetPeer()->GetLayoutInset( left, top, right, bottom );
         border -= left;
     }
-    
+
     return border;
 }
 
@@ -2318,14 +2318,14 @@ long wxWindowMac::MacGetRightBorderSize() const
 {
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
-    
+
     if ( GetPeer() )
     {
         int left, top, right, bottom;
         GetPeer()->GetLayoutInset( left, top, right, bottom );
         border -= right;
     }
-    
+
     return border;
 }
 
@@ -2333,14 +2333,14 @@ long wxWindowMac::MacGetTopBorderSize() const
 {
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
-    
+
     if ( GetPeer() )
     {
         int left, top, right, bottom;
         GetPeer()->GetLayoutInset( left, top, right, bottom );
         border -= top;
     }
-    
+
     return border;
 }
 
@@ -2348,14 +2348,14 @@ long wxWindowMac::MacGetBottomBorderSize() const
 {
     // the wx borders are all symmetric in mac themes
     long border = MacGetWXBorderSize() ;
-    
+
     if ( GetPeer() )
     {
         int left, top, right, bottom;
         GetPeer()->GetLayoutInset( left, top, right, bottom );
         border -= bottom;
     }
-    
+
     return border;
 }
 
@@ -2530,18 +2530,18 @@ wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler),
             GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode );
             GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
             GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
-            
+
             UInt32 keymessage = (keyCode << 8) + charCode;
-            
+
             wxKeyEvent wxevent(wxEVT_HOTKEY);
             wxevent.SetId(hotKeyId.id);
             wxTheApp->MacCreateKeyEvent( wxevent, s_hotkeys[i].window , keymessage , 
                                         modifiers , when , 0 ) ;
-            
+
             s_hotkeys[i].window->HandleWindowEvent(wxevent);
         }
     }
-    
+
     return noErr;
 }
 
@@ -2552,11 +2552,11 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
         if ( s_hotkeys[i].keyId == hotkeyId )
         {
             wxLogLastError(wxT("hotkeyId already registered"));
-                
+
             return false;
         }
     }
-    
+
     static bool installed = false;
     if ( !installed )
     {
@@ -2567,7 +2567,7 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
         InstallApplicationEventHandler(&wxHotKeyHandler, 1, &eventType, NULL, NULL);
         installed = true;
     }
-    
+
     UInt32 mac_modifiers=0;
     if ( modifiers & wxMOD_ALT )
         mac_modifiers |= optionKey;
@@ -2577,18 +2577,18 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
         mac_modifiers |= controlKey;
     if ( modifiers & wxMOD_CONTROL )
         mac_modifiers |= cmdKey;
-    
+
     EventHotKeyRef hotKeyRef;
     EventHotKeyID hotKeyIDmac;
-    
+
     hotKeyIDmac.signature = 'WXMC';
     hotKeyIDmac.id = hotkeyId;
-    
+
     if ( RegisterEventHotKey(wxCharCodeWXToOSX((wxKeyCode)keycode), mac_modifiers, hotKeyIDmac,
                         GetApplicationEventTarget(), 0, &hotKeyRef) != noErr )
     {
         wxLogLastError(wxT("RegisterHotKey"));
-        
+
         return false;
     }
     else
@@ -2597,10 +2597,10 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
         v.ref = hotKeyRef;
         v.keyId = hotkeyId;
         v.window = this;
-        
+
         s_hotkeys.push_back(v);
     }
-    
+
     return true;
 }
 
@@ -2615,14 +2615,14 @@ bool wxWindowMac::UnregisterHotKey(int hotkeyId)
             if ( UnregisterEventHotKey(ref) != noErr )
             {
                 wxLogLastError(wxT("UnregisterHotKey"));
-                
+
                 return false;
             }
             else 
                 return true;
         }
     }
-    
+
     return false;
 }
 
@@ -2631,7 +2631,7 @@ bool wxWindowMac::UnregisterHotKey(int hotkeyId)
 bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
 {
     bool handled = false;
-    
+
     // moved the ordinary key event sending AFTER the accel evaluation
 
 #if wxUSE_ACCEL
@@ -2665,7 +2665,7 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
         }
     }
 #endif // wxUSE_ACCEL
-    
+
     if ( !handled )
     {
         handled = HandleWindowEvent( event ) ;
@@ -2738,9 +2738,9 @@ void wxWidgetImpl::RemoveAssociations(wxWidgetImpl* impl)
 
 void wxWidgetImpl::RemoveAssociation(WXWidget control)
 {
-	wxCHECK_RET( control != NULL, wxT("attempt to remove a NULL WXWidget from control map") );
+    wxCHECK_RET( control != NULL, wxT("attempt to remove a NULL WXWidget from control map") );
 
-	wxWinMacControlList.erase(control);
+    wxWinMacControlList.erase(control);
 }
 
 wxIMPLEMENT_ABSTRACT_CLASS(wxWidgetImpl, wxObject);