Warning fix.

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 1a0b98a5613cece9f24ffc296b7a104ad439a285..5d37684b7dec17d7b19c939ec6fb2583241e538b 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/frame.h"

     #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 
     #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 


@@ -60,11 +61,11 @@ wxStatusBarBase::~wxStatusBarBase()
 {
     FreeWidths();
     FreeStacks();
 {
     FreeWidths();
     FreeStacks();

-    InitStyles();
+    FreeStyles();

 
     // notify the frame that it doesn't have a status bar any longer to avoid
     // dangling pointers
 
     // notify the frame that it doesn't have a status bar any longer to avoid
     // dangling pointers

-    wxFrameBase *frame = wxDynamicCast(GetParent(), wxFrameBase);
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

     if ( frame && frame->GetStatusBar() == this )
     {
         frame->SetStatusBar(NULL);
     if ( frame && frame->GetStatusBar() == this )
     {
         frame->SetStatusBar(NULL);


@@ -284,12 +285,12 @@ void wxStatusBarBase::InitStacks()
 
 void wxStatusBarBase::FreeStacks()
 {
 
 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);
         {
             wxListString& t = *m_statusTextStacks[i];
             WX_CLEAR_LIST(wxListString, t);