X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e40298d54ecd5b109222a7c60aa2ef084a304d69..b9b8a2b5d79c50af78720589dc96cd7e16cde26e:/src/mac/statbrma.cpp?ds=sidebyside

diff --git a/src/mac/statbrma.cpp b/src/mac/statbrma.cpp
index e39e83bb81..b2dba2135d 100644
--- a/src/mac/statbrma.cpp
+++ b/src/mac/statbrma.cpp
@@ -72,7 +72,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
     dc.GetTextExtent(text, &x, &y);
     
     int xpos = rect.x + leftMargin + 1 ;
-    int ypos = 2 ;
+    int ypos = 1 ;
     
     dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
     
@@ -97,39 +97,55 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
     rect.y=0;
     rect.height = m_height ;
     Refresh( TRUE , &rect ) ;
+    Update();
 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
-    wxPaintDC dc(this);
-    dc.Clear() ;
-    
-    if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-    {
-        wxPen black( wxBLACK , 1 , wxSOLID ) ;
-        wxPen white( wxWHITE , 1 , wxSOLID ) ;
-        
-        dc.SetPen(black);
-        dc.DrawLine(0, 0 ,
-            m_width , 0);
-        dc.SetPen(white);
-        dc.DrawLine(0, 1 ,
-            m_width , 1);
-    }
-    else
-    {
-        dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
-        dc.DrawLine(0, 0 ,
-            m_width , 0);
-    }
-    
-    int i;
-    if ( GetFont().Ok() )
-        dc.SetFont(GetFont());
-    dc.SetBackgroundMode(wxTRANSPARENT);
-    
-    for ( i = 0; i < m_nFields; i ++ )
-        DrawField(dc, i);
+  	wxPaintDC dc(this);
+  	dc.Clear() ;
+
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+
+	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));  
+        }
+        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) 
+            //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);
+	}
+
+	int i;
+	if ( GetFont().Ok() )
+		dc.SetFont(GetFont());
+	dc.SetBackgroundMode(wxTRANSPARENT);
+
+	for ( i = 0; i < m_nFields; i ++ )
+		DrawField(dc, i);
 }
 
 void wxStatusBarMac::MacSuperEnabled( bool enabled )