!__WX_DC_BLIT_FIXED__ case

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 1a0b98a5613cece9f24ffc296b7a104ad439a285..e1c4fd3dffb8a5445bfd923143cceeb6805581c4 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/statbar.cpp
+// Name:        src/common/statbar.cpp
 // Purpose:     wxStatusBarBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "statbar.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,14 +24,18 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_STATUSBAR
+
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/statusbr.h"
+    #include "wx/frame.h"
 #endif //WX_PRECOMP
 
-#if wxUSE_STATUSBAR
-
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListString);
+WX_DEFINE_LIST(wxListString)
+
+const wxChar wxStatusBarNameStr[] = wxT("statusBar");
 
 // ============================================================================
 // wxStatusBarBase implementation
@@ -60,11 +60,11 @@ 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);
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( frame && frame->GetStatusBar() == this )
     {
         frame->SetStatusBar(NULL);
@@ -284,12 +284,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);
@@ -357,4 +357,3 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
 }
 
 #endif // wxUSE_STATUSBAR
-