Added extra width for controls to avoid edge being clipped

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index b2dba2135d7b7919da99a4da176a3b9415de534c..b302d82ab659502735eb410d0379eb44dde5cb27 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -1,45 +1,50 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        statbar.cpp
+// Name:        src/mac/carbon/statbarma.cpp

 // Purpose:     native implementation of wxStatusBar (optional)
 // Author:      Stefan Csomor
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statbrma.h"
-#endif
+#include "wx/wxprec.h"

 
 

-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
+#if wxUSE_STATUSBAR

 
 #include "wx/statusbr.h"
 
 #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()
 
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
     EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
 

-#ifdef __WXMAC__
-#include "wx/mac/private.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()
 
 wxStatusBarMac::wxStatusBarMac()

+        :
+        wxStatusBarGeneric()

 {
 {

-    SetParent(NULL);
+    SetParent( NULL );

 }
 
 wxStatusBarMac::~wxStatusBarMac()
 }
 
 wxStatusBarMac::~wxStatusBarMac()


@@ -50,34 +55,44 @@ 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 );
+
+    // normal system font is too tall for fitting into the standard height
+    SetWindowVariant( wxWINDOW_VARIANT_SMALL );
+
+    return true;

 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {

-    int leftMargin = 2;
-    
+    int w, h;
+    GetSize( &w , &h );

     wxRect rect;
     wxRect rect;

-    GetFieldRect(i, rect);
-    
-    if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-    {
-        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);
     dc.GetTextExtent(text, &x, &y);

-    
-    int xpos = rect.x + leftMargin + 1 ;
-    int ypos = 1 ;
-    
-    dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
-    
+
+    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.DrawText(text, xpos, ypos);

-    
+

     dc.DestroyClippingRegion();
 }
 
     dc.DestroyClippingRegion();
 }
 


@@ -89,67 +104,78 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
 void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
 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);
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);

-    rect.y=0;
-    rect.height = m_height ;
-    Refresh( TRUE , &rect ) ;
+    int w, h;
+    GetSize( &w, &h );
+    rect.y = 0;
+    rect.height = h ;
+    Refresh( true, &rect );

     Update();
 }
 
     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 );
     wxGetOsVersion( &major, &minor );

+    int w, h;
+    GetSize( &w, &h );

 
 

-       if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
-       {
-               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)
-            dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));  
+            // Finder statusbar border color: (Project Builder similar is 9B9B9B)
+            if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
+                dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 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.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)); 
+        }
+
+        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
         else

-            dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
+            dc.SetPen(wxPen(wxColour(0x80, 0x80, 0x80), 1, wxSOLID));

 
 

-               dc.DrawLine(0, 0 ,
-                      m_width , 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::MacSuperEnabled( bool enabled ) 
+void wxStatusBarMac::MacHiliteChanged()

 {
 {

-    Refresh(FALSE) ;
-    wxWindow::MacSuperEnabled( enabled ) ;
+    Refresh();
+    Update();

 }
 }

+
+#endif // wxUSE_STATUSBAR
+