X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d1a4878f36ba4b5f66c2ccfd2cb27a9dc528b6f..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/statbrma.cpp

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 86a80758d2..926198c3b0 100644
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -1,48 +1,50 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        statbar.cpp
+// Name:        src/mac/carbon/statbarma.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
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statbrma.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 #include "wx/wxprec.h"
 
+#if wxUSE_STATUSBAR
+
 #include "wx/statusbr.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
+#endif
+
+#include "wx/mac/private.h"
+
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
     EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 
-#ifdef __WXMAC__
-#include "wx/mac/private.h"
-#include "wx/toplevel.h"
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
 
-// ----------------------------------------------------------------------------
-// wxStatusBarMac class
-// ----------------------------------------------------------------------------
+wxStatusBarMac::wxStatusBarMac(wxWindow *parent,
+        wxWindowID id,
+        long style,
+        const wxString& name)
+        :
+        wxStatusBarGeneric()
+{
+    SetParent( NULL );
+    Create( parent, id, style, name );
+}
 
 wxStatusBarMac::wxStatusBarMac()
+        :
+        wxStatusBarGeneric()
 {
-    SetParent(NULL);
+    SetParent( NULL );
 }
 
 wxStatusBarMac::~wxStatusBarMac()
@@ -53,47 +55,44 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
                             long style ,
                             const wxString& name)
 {
-    if( !wxStatusBarGeneric::Create( parent , id , style , name ) )
-        return FALSE ;
-    
+    if ( !wxStatusBarGeneric::Create( parent, id, style, name ) )
+        return false;
+
     if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
-        MacSetBackgroundBrush( wxNullBrush ) ;    
-    
+        SetBackgroundStyle( wxBG_STYLE_TRANSPARENT );
+
     // normal system font is too tall for fitting into the standard height
-    SetWindowVariant( wxWINDOW_VARIANT_SMALL ) ;
-    
-    return TRUE ;
+    SetWindowVariant( wxWINDOW_VARIANT_SMALL );
+
+    return true;
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
-    int leftMargin = 2;
-    int w, h ;
-    GetSize( &w , &h ) ;
+    int w, h;
+    GetSize( &w , &h );
     wxRect rect;
-    GetFieldRect(i, rect);
-    
-    if ( !MacIsReallyHilited()  )
-    {
-        dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
-    }
-    
-    wxString text(GetStatusText(i));
-    
-    long x, y;
-    
+    GetFieldRect( i, rect );
+
+    if ( !MacIsReallyHilited() )
+        dc.SetTextForeground( wxColour( 0x80, 0x80, 0x80 ) );
+
+    wxString text(GetStatusText( i ));
+
+    wxCoord x, y;
     dc.GetTextExtent(text, &x, &y);
-    
-    int xpos = rect.x + leftMargin + 1 ;
-    int ypos = 1 ;
-    
-    if ( MacGetTopLevelWindow()->MacGetMetalAppearance()  )
-        ypos++ ;
-        
+
+    int leftMargin = 2;
+    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.DestroyClippingRegion();
 }
 
@@ -105,74 +104,78 @@ 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") );
-    
+        wxT("invalid status bar field index") );
+
+    if ( m_statusStrings[number] == text )
+        return ;
+
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
-    int w, h ;
-    GetSize( &w , &h ) ;
-    rect.y=0;
+    int w, h;
+    GetSize( &w, &h );
+    rect.y = 0;
     rect.height = h ;
-    Refresh( TRUE , &rect ) ;
+    Refresh( true, &rect );
     Update();
 }
 
-void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
+void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-  	wxPaintDC dc(this);
-  	dc.Clear() ;
+    wxPaintDC dc(this);
+    dc.Clear();
 
-    int major,minor;
+    int major, minor;
     wxGetOsVersion( &major, &minor );
-    int w, h ;
-    GetSize( &w , &h ) ;
+    int w, h;
+    GetSize( &w, &h );
 
-	if ( MacIsReallyHilited() )
-	{
-		wxPen white( wxWHITE , 1 , wxSOLID ) ;
-        if (major >= 10 ) 
+    if ( MacIsReallyHilited() )
+    {
+        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)
             if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
-                dc.SetPen(wxPen(wxColour(0x40,40,40) ,1,wxSOLID)) ;
+                dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxSOLID));
             else
-                dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  
+                dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID));
         }
         else
         {
-            wxPen black( wxBLACK , 1 , wxSOLID ) ;
+            wxPen black( *wxBLACK , 1 , wxSOLID );
             dc.SetPen(black);
-    	}
-		dc.DrawLine(0, 0 ,
-		       w , 0);
-		dc.SetPen(white);
-		dc.DrawLine(0, 1 ,
-		       w , 1);
-	}
-	else
-	{
-        if (major >= 10) 
-            //Finder statusbar border color: (Project builder similar is 9B9B9B)
-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID)); 
+        }
+
+        dc.DrawLine(0, 0, w, 0);
+        dc.SetPen(white);
+        dc.DrawLine(0, 1, w, 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.SetPen(wxPen(wxColour(0x80, 0x80, 0x80), 1, wxSOLID));
 
-		dc.DrawLine(0, 0 ,
-		       w , 0);
-	}
+        dc.DrawLine(0, 0, w, 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::MacHiliteChanged()
 {
-    Refresh() ;
-    Update() ;
+    Refresh();
+    Update();
 }
+
+#endif // wxUSE_STATUSBAR
+