#ifdef __WXMAC__
#include "wx/mac/private.h"
+#include "wx/toplevel.h"
#endif
// ============================================================================
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)
{
int leftMargin = 2;
-
+ int w, h ;
+ GetSize( &w , &h ) ;
wxRect rect;
GetFieldRect(i, rect);
- if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+ if ( !MacIsReallyHilited() )
{
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
}
dc.GetTextExtent(text, &x, &y);
int xpos = rect.x + leftMargin + 1 ;
- int ypos = 2 ;
+ int ypos = 1 ;
- dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
+ if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
+ ypos++ ;
+
+ dc.SetClippingRegion(rect.x, 0, rect.width, h);
dc.DrawText(text, xpos, ypos);
m_statusStrings[number] = text;
wxRect rect;
GetFieldRect(number, rect);
+ int w, h ;
+ GetSize( &w , &h ) ;
rect.y=0;
- rect.height = m_height ;
+ rect.height = h ;
Refresh( TRUE , &rect ) ;
+ Update();
}
void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
{
- wxPaintDC dc(this);
- dc.Clear() ;
-
- if ( IsWindowHilited( MAC_WXHWND( 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);
+ wxPaintDC dc(this);
+ 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 ) ;
+ Refresh() ;
+ Update() ;
}