use wxString::Format(), calling string.Format() has no effect patch 1267345)

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 8f3562c07496f4a10c71b48c72db37a14eb1fce6..c926d76b01cb271970cfbccab0b9fe4ca67b0cff 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "statbrma.h"
 #endif
 
 #pragma implementation "statbrma.h"
 #endif
 


@@ -17,6 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+#include "wx/wxprec.h"
+

 #include "wx/statusbr.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/statusbr.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"


@@ -27,6 +29,7 @@ END_EVENT_TABLE()
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"

+#include "wx/toplevel.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -53,7 +56,11 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
     if( !wxStatusBarGeneric::Create( parent , id , style , name ) )
         return FALSE ;
     
     if( !wxStatusBarGeneric::Create( parent , id , style , name ) )
         return FALSE ;
     

-    m_macBackgroundBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;    
+    if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
+        MacSetBackgroundBrush( wxNullBrush ) ;    
+    
+    // normal system font is too tall for fitting into the standard height
+    SetWindowVariant( wxWINDOW_VARIANT_SMALL ) ;

     
     return TRUE ;
 }
     
     return TRUE ;
 }


@@ -66,7 +73,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
     wxRect rect;
     GetFieldRect(i, rect);
     
     wxRect rect;
     GetFieldRect(i, rect);
     

-    if ( !IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) )
+    if ( !MacIsReallyHilited()  )

     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }
     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }


@@ -80,6 +87,9 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
     
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
     

+    if ( MacGetTopLevelWindow()->MacGetMetalAppearance()  )
+        ypos++ ;
+        

     dc.SetClippingRegion(rect.x, 0, rect.width, h);
     
     dc.DrawText(text, xpos, ypos);
     dc.SetClippingRegion(rect.x, 0, rect.width, h);
     
     dc.DrawText(text, xpos, ypos);


@@ -97,6 +107,9 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
         _T("invalid status bar field index") );
     
     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);
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);


@@ -118,17 +131,20 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
     int w, h ;
     GetSize( &w , &h ) ;
 
     int w, h ;
     GetSize( &w , &h ) ;
 

-       if ( IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) )
+       if ( MacIsReallyHilited() )

        {
        {

-               wxPen white( wxWHITE , 1 , wxSOLID ) ;
-        if (major >= 10) 
+               wxPen white( *wxWHITE , 1 , wxSOLID ) ;
+        if (major >= 10 ) 

         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)
         {
             //Finder statusbar border color: (Project builder similar is 9B9B9B)

-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  
+            if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
+                dc.SetPen(wxPen(wxColour(0x40,40,40) ,1,wxSOLID)) ;
+            else
+                dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  

         }
         else
         {
         }
         else
         {

-            wxPen black( wxBLACK , 1 , wxSOLID ) ;
+            wxPen black( *wxBLACK , 1 , wxSOLID ) ;

             dc.SetPen(black);
        }
                dc.DrawLine(0, 0 ,
             dc.SetPen(black);
        }
                dc.DrawLine(0, 0 ,


@@ -157,3 +173,9 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
        for ( i = 0; i < m_nFields; i ++ )
                DrawField(dc, i);
 }
        for ( i = 0; i < m_nFields; i ++ )
                DrawField(dc, i);
 }

+
+void wxStatusBarMac::MacHiliteChanged()
+{
+    Refresh() ;
+    Update() ;
+}