X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9a961e1aefd34f581d2e3564ca29d7b20f9b082..83c5e93495986edd1dbf8af1aa040666d0a635d1:/src/generic/statusbr.cpp diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 831d2d8717..e0bd6f8d08 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -66,10 +66,6 @@ void wxStatusBarGeneric::Init() wxStatusBarGeneric::~wxStatusBarGeneric() { - // VZ: what is this for? please comment... -#ifdef __WXMSW__ - SetFont(wxNullFont); -#endif // MSW } bool wxStatusBarGeneric::Create(wxWindow *parent, @@ -85,10 +81,6 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, // The status bar should have a themed background SetThemeEnabled( true ); - // Don't wish this to be found as a child -#ifndef __WXMAC__ - parent->GetChildren().DeleteObject(this); -#endif InitColours(); #ifdef __WXPM__ @@ -140,11 +132,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?") ); }