use wxFileSize_t instead of wxFileOffset or off_t

[wxWidgets.git] / src / generic / statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 831d2d8717e73454eccb8cd5ab742341b9f31f5a..203295199ac45ee3fd24ac7731695aa0c5368102 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -68,7 +68,9 @@ wxStatusBarGeneric::~wxStatusBarGeneric()
 {
     // VZ: what is this for? please comment...
 #ifdef __WXMSW__
-    SetFont(wxNullFont);
+    // JACS: commenting out since it causes an assert
+    // and there seems no reason for it.
+    // SetFont(wxNullFont);
 #endif // MSW
 }
 
@@ -140,11 +142,11 @@ void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
     for (i = m_nFields - 1; i >= number; --i)
         m_statusStrings.RemoveAt(i);
 
-    wxStatusBarBase::SetFieldsCount(number, widths);
-
     // forget the old cached pixel widths
     m_widthsAbs.Empty();
 
+    wxStatusBarBase::SetFieldsCount(number, widths);
+
     wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
                   _T("This really should never happen, can we do away with m_nFields here?") );
 }