#ifdef __WXMAC__
#include "wx/mac/private.h"
+#include "wx/toplevel.h"
#endif
// ============================================================================
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 ;
}
wxRect rect;
GetFieldRect(i, rect);
- if ( !IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) )
+ if ( !MacIsReallyHilited() )
{
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
}
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);
int w, h ;
GetSize( &w , &h ) ;
- if ( IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) )
+ if ( MacIsReallyHilited() )
{
wxPen white( wxWHITE , 1 , wxSOLID ) ;
- if (major >= 10)
+ if (major >= 10 )
{
//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
{
for ( i = 0; i < m_nFields; i ++ )
DrawField(dc, i);
}
+
+void wxStatusBarMac::MacHiliteChanged()
+{
+ Refresh() ;
+ Update() ;
+}