X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe9fea7ec75fe38527702b8ae7926a5609828b79..707005337735f36dbf1f13d83956f8c08e996191:/src/univ/statusbr.cpp diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp index 62f7257458..ab7c9374cf 100644 --- a/src/univ/statusbr.cpp +++ b/src/univ/statusbr.cpp @@ -88,6 +88,8 @@ wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields) wxRect rect = GetClientRect(); // no, don't do this - the borders are meant to be inside this rect + // wxSize sizeBorders = + m_renderer->GetStatusBarBorders(borderBetweenFields); //rect.Deflate(sizeBorders.x, sizeBorders.y); // recalc the field widths if needed @@ -110,7 +112,7 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer) // prepare the DC wxDC& dc = renderer->GetDC(); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); // do draw the fields int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED; @@ -242,7 +244,7 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const wxCoord wxStatusBarUniv::GetHeight() const { wxClientDC dc(wxConstCast(this, wxStatusBarUniv)); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); return dc.GetCharHeight() + 2*GetBorderY(); }