X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71786e29faec237f66f3a9a2e63c000ccd056143..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/statbrma.cpp?ds=sidebyside diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp index e743653a1d..926198c3b0 100644 --- a/src/mac/carbon/statbrma.cpp +++ b/src/mac/carbon/statbrma.cpp @@ -11,12 +11,17 @@ #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" -#include "wx/toplevel.h" BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric) @@ -54,7 +59,7 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id, 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 ); @@ -74,8 +79,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i) wxString text(GetStatusText( i )); - long x, y; - + wxCoord x, y; dc.GetTextExtent(text, &x, &y); int leftMargin = 2; @@ -172,3 +176,6 @@ void wxStatusBarMac::MacHiliteChanged() Refresh(); Update(); } + +#endif // wxUSE_STATUSBAR +