Declare strptime when using MSL headers on OS X.

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 831d2d8717e73454eccb8cd5ab742341b9f31f5a..e0bd6f8d084fa10a4c00d52244bf9093d52bfc11 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -66,10 +66,6 @@ void wxStatusBarGeneric::Init()
 
 wxStatusBarGeneric::~wxStatusBarGeneric()
 {
 
 wxStatusBarGeneric::~wxStatusBarGeneric()
 {

-    // VZ: what is this for? please comment...
-#ifdef __WXMSW__
-    SetFont(wxNullFont);
-#endif // MSW

 }
 
 bool wxStatusBarGeneric::Create(wxWindow *parent,
 }
 
 bool wxStatusBarGeneric::Create(wxWindow *parent,


@@ -85,10 +81,6 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
   // The status bar should have a themed background
   SetThemeEnabled( true );
 
   // 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__
   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);
 
     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();
 
     // 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?") );
 }
     wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
                   _T("This really should never happen, can we do away with m_nFields here?") );
 }