X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..b4446c244775324631b8dd2b588ea35f32e71728:/src/mac/classic/statbrma.cpp

diff --git a/src/mac/classic/statbrma.cpp b/src/mac/classic/statbrma.cpp
index 4adcdf4a02..f2a36929af 100644
--- a/src/mac/classic/statbrma.cpp
+++ b/src/mac/classic/statbrma.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        statbar.cpp
+// Name:        src/mac/classic/statbar.cpp
 // Purpose:     native implementation of wxStatusBar (optional)
 // Author:      Stefan Csomor
-// Modified by: 
+// Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
@@ -14,15 +14,18 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/statusbr.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+#endif
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
     EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+    #include "wx/mac/private.h"
 #endif
 
 // ============================================================================
@@ -52,28 +55,28 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
     int leftMargin = 2;
-    
+
     wxRect rect;
     GetFieldRect(i, rect);
-    
+
     if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }
-    
+
     wxString text(GetStatusText(i));
-    
+
     long x, y;
-    
+
     dc.GetTextExtent(text, &x, &y);
-    
+
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
-    
+
     dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
-    
+
     dc.DrawText(text, xpos, ypos);
-    
+
     dc.DestroyClippingRegion();
 }
 
@@ -86,7 +89,7 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
         _T("invalid status bar field index") );
-    
+
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
@@ -98,53 +101,53 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
-  	wxPaintDC dc(this);
-  	dc.Clear() ;
+    wxPaintDC dc(this);
+    dc.Clear() ;
 
     int major,minor;
     wxGetOsVersion( &major, &minor );
 
-	if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-	{
-		wxPen white( wxWHITE , 1 , wxSOLID ) ;
-        if (major >= 10) 
+    if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+    {
+        wxPen white( wxWHITE , 1 , wxSOLID ) ;
+        if (major >= 10)
         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  
+            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
         }
         else
         {
             wxPen black( wxBLACK , 1 , wxSOLID ) ;
             dc.SetPen(black);
-    	}
-		dc.DrawLine(0, 0 ,
-		       m_width , 0);
-		dc.SetPen(white);
-		dc.DrawLine(0, 1 ,
-		       m_width , 1);
-	}
-	else
-	{
-        if (major >= 10) 
+        }
+        dc.DrawLine(0, 0 ,
+                    m_width , 0);
+        dc.SetPen(white);
+        dc.DrawLine(0, 1 ,
+        m_width , 1);
+    }
+    else
+    {
+        if (major >= 10)
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID)); 
+            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
         else
             dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
 
-		dc.DrawLine(0, 0 ,
-		       m_width , 0);
-	}
+        dc.DrawLine(0, 0 ,
+               m_width , 0);
+    }
 
-	int i;
-	if ( GetFont().Ok() )
-		dc.SetFont(GetFont());
-	dc.SetBackgroundMode(wxTRANSPARENT);
+    int i;
+    if ( GetFont().Ok() )
+        dc.SetFont(GetFont());
+    dc.SetBackgroundMode(wxTRANSPARENT);
 
-	for ( i = 0; i < m_nFields; i ++ )
-		DrawField(dc, i);
+    for ( i = 0; i < m_nFields; i ++ )
+        DrawField(dc, i);
 }
 
-void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
+void wxStatusBarMac::MacSuperEnabled( bool enabled )
 {
     Refresh(FALSE) ;
     wxWindow::MacSuperEnabled( enabled ) ;