X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71e030352d74e4e6aed28cfcb0ea6edf3d17af6e..c0fbf24ba6abc81db66ead334d69af670a8ec5a7:/src/univ/statusbr.cpp

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 679e664bce..143b6fcde8 100644
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -30,6 +30,8 @@
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
 #endif
 
 #include "wx/statusbr.h"
@@ -83,12 +85,11 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
 
 wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields)
 {
-    // determine the space we have for the fields
-    wxSize sizeBorders = m_renderer->GetStatusBarBorders(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
@@ -111,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;
@@ -185,9 +186,8 @@ wxString wxStatusBarUniv::GetStatusText(int number) const
 
 void wxStatusBarUniv::SetFieldsCount(int number, const int *widths)
 {
-    wxStatusBarBase::SetFieldsCount(number, widths);
-
     m_statusText.SetCount(number);
+    wxStatusBarBase::SetFieldsCount(number, widths);
     m_widthsAbs.Empty();
 }
 
@@ -243,7 +243,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();
 }