added wxConvFileName which is a variable, not define as wxConvFile; added comments...

[wxWidgets.git] / src / common / statbar.cpp

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 492573e98bda782672615aaa4453becefc7232c0..0544a98b67530e815a1049dfb1ccbed8dfdfb6b4 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/frame.h"
     #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 
@@ -60,7 +61,15 @@ wxStatusBarBase::~wxStatusBarBase()
 {
     FreeWidths();
     FreeStacks();
-    InitStyles();
+    FreeStyles();
+
+    // notify the frame that it doesn't have a status bar any longer to avoid
+    // dangling pointers
+    wxFrameBase *frame = wxDynamicCast(GetParent(), wxFrameBase);
+    if ( frame && frame->GetStatusBar() == this )
+    {
+        frame->SetStatusBar(NULL);
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -276,12 +285,12 @@ void wxStatusBarBase::InitStacks()
 
 void wxStatusBarBase::FreeStacks()
 {
-    if(!m_statusTextStacks) return;
-    size_t i;
+    if ( !m_statusTextStacks )
+        return;
 
-    for(i = 0; i < (size_t)m_nFields; ++i)
+    for ( size_t i = 0; i < (size_t)m_nFields; ++i )
     {
-        if(m_statusTextStacks[i])
+        if ( m_statusTextStacks[i] )
         {
             wxListString& t = *m_statusTextStacks[i];
             WX_CLEAR_LIST(wxListString, t);