X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dbc7fb4e5865133659c194d73f34e91bbe7e8d0..30bb5e18acd15fdab9ca70f600eee43771e28928:/src/mac/statbrma.cpp

diff --git a/src/mac/statbrma.cpp b/src/mac/statbrma.cpp
index c06702058d..b2dba2135d 100644
--- a/src/mac/statbrma.cpp
+++ b/src/mac/statbrma.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        statbar.cpp
 // Purpose:     native implementation of wxStatusBar (optional)
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by: 
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 AUTHOR
+// Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -22,7 +22,7 @@
 #include "wx/dcclient.h"
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
-	EVT_PAINT(wxStatusBarMac::OnPaint)
+    EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 
 #ifdef __WXMAC__
@@ -47,38 +47,38 @@ wxStatusBarMac::~wxStatusBarMac()
 }
 
 bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
-           long style ,
-           const wxString& name)
+                            long style ,
+                            const wxString& name)
 {
-	return wxStatusBarGeneric::Create( parent , id , style , name ) ;
+    return wxStatusBarGeneric::Create( parent , id , style , name ) ;
 }
 
 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 = 2 ;
-  
-  dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
-
-  dc.DrawText(text, xpos, ypos);
-
-  dc.DestroyClippingRegion();
+    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();
 }
 
 void wxStatusBarMac::DrawField(wxDC& dc, int i)
@@ -89,14 +89,15 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
 void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
-                 _T("invalid status bar field index") );
-
+        _T("invalid status bar field index") );
+    
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
     rect.y=0;
     rect.height = m_height ;
     Refresh( TRUE , &rect ) ;
+    Update();
 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
@@ -104,12 +105,22 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
   	wxPaintDC dc(this);
   	dc.Clear() ;
 
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+
 	if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
 	{
-		wxPen black( wxBLACK , 1 , wxSOLID ) ;
 		wxPen white( wxWHITE , 1 , wxSOLID ) ;
-
-		dc.SetPen(black);
+        if (major >= 10) 
+        {
+            //Finder statusbar border color: (Project builder similar is 9B9B9B)
+            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);
@@ -118,7 +129,12 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 	}
 	else
 	{
-		dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
+        if (major >= 10) 
+            //Finder statusbar border color: (Project builder similar is 9B9B9B)
+            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);
 	}