applied patch 923858 (fixes crash in zlib streams)

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index f0d2b9bfa46ca1da42086d7ea27e34a127f1c5f8..8220559531ab79855966c3752e5bf4a5e0a9e73d 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/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,9 +22,14 @@
 #include "wx/dcclient.h"
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
-       EVT_PAINT(wxStatusBarMac::OnPaint)
+    EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#include "wx/toplevel.h"
+#endif
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -43,38 +48,48 @@ 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 ) ;
+    if( !wxStatusBarGeneric::Create( parent , id , style , name ) )
+        return FALSE ;
+    
+    if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
+        MacSetBackgroundBrush( wxNullBrush ) ;    
+    
+    return TRUE ;
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
-  int leftMargin = 2;
-
-  wxRect rect;
-  GetFieldRect(i, rect);
-  
-  if ( !IsWindowHilited( 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;
+    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;
+    
+    dc.GetTextExtent(text, &x, &y);
+    
+    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();
 }
 
 void wxStatusBarMac::DrawField(wxDC& dc, int i)
@@ -85,62 +100,74 @@ 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);
+    int w, h ;
+    GetSize( &w , &h ) ;
+    rect.y=0;
+    rect.height = h ;
     Refresh( TRUE , &rect ) ;
-    /*
-    // TODO make clear work again also when using themes
-    wxClientDC dc(this);
-    dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) );
-    dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 );
-    dc.Clear();
-    dc.DestroyClippingRegion();
-    DrawFieldText( dc, number );
-    */
-
+    Update();
 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
        wxPaintDC dc(this);
-       
-  if ( IsWindowHilited( 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);
-
-#   ifdef __WXMSW__
-        dc.SetFont(wxNullFont);
-#   endif // MSW
+       dc.Clear() ;
+
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+    int w, h ;
+    GetSize( &w , &h ) ;
+
+       if ( MacIsReallyHilited() )
+       {
+               wxPen white( wxWHITE , 1 , wxSOLID ) ;
+        if (major >= 10 ) 
+        {
+            //Finder statusbar border color: (Project builder similar is 9B9B9B)
+            if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
+                dc.SetPen(wxPen(wxColour(0x40,40,40) ,1,wxSOLID)) ;
+            else
+                dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  
+        }
+        else
+        {
+            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)); 
+        else
+            dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
+
+               dc.DrawLine(0, 0 ,
+                      w , 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 ) 
+void wxStatusBarMac::MacHiliteChanged()
 {
-    Refresh(FALSE) ;
-    wxWindow::MacSuperEnabled( enabled ) ;
-}
\ No newline at end of file
+    Refresh() ;
+    Update() ;
+}