Font (possible) fix

[wxWidgets.git] / src / mac / carbon / statbrma.cpp

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index f7b7ad477f3192bb738bdcc693b71311c495ebbe..95a4f258f6f0b4e5c5217de75926ec6e321ee7f5 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -6,17 +6,15 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "statbrma.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/wxprec.h"
+
 #include "wx/statusbr.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
@@ -57,6 +55,9 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
     if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
         MacSetBackgroundBrush( wxNullBrush ) ;    
     
+    // normal system font is too tall for fitting into the standard height
+    SetWindowVariant( wxWINDOW_VARIANT_SMALL ) ;
+    
     return TRUE ;
 }
 
@@ -102,6 +103,9 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
         _T("invalid status bar field index") );
     
+    if ( m_statusStrings[number] == text )
+        return ;
+    
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
@@ -125,7 +129,7 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 
        if ( MacIsReallyHilited() )
        {
-               wxPen white( wxWHITE , 1 , wxSOLID ) ;
+               wxPen white( *wxWHITE , 1 , wxSOLID ) ;
         if (major >= 10 ) 
         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
@@ -136,7 +140,7 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
         }
         else
         {
-            wxPen black( wxBLACK , 1 , wxSOLID ) ;
+            wxPen black( *wxBLACK , 1 , wxSOLID ) ;
             dc.SetPen(black);
        }
                dc.DrawLine(0, 0 ,