#endif
#ifndef WX_PRECOMP
+ #include "wx/frame.h"
#include "wx/statusbr.h"
#endif //WX_PRECOMP
{
FreeWidths();
FreeStacks();
- InitStyles();
+ FreeStyles();
+
+ // notify the frame that it doesn't have a status bar any longer to avoid
+ // dangling pointers
+ wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+ if ( frame && frame->GetStatusBar() == this )
+ {
+ frame->SetStatusBar(NULL);
+ }
}
// ----------------------------------------------------------------------------
{
wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") );
- bool refresh = FALSE;
+ bool refresh = false;
if ( number != m_nFields )
{
ReinitWidths();
- refresh = TRUE;
+ refresh = true;
}
//else: keep the old m_statusWidths if we had them
SetStatusWidths(number, widths);
// already done from SetStatusWidths()
- refresh = FALSE;
+ refresh = false;
}
if ( refresh )
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);