[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 0544a98b67530e815a1049dfb1ccbed8dfdfb6b4..8e51e041ba18122c3f83af81317459966ad85c05 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,15 +24,16 @@
     #pragma hdrstop
 #endif
 
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
-    #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 
 #if wxUSE_STATUSBAR
 
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListString);
+WX_DEFINE_LIST(wxListString)
 
 // ============================================================================
 // wxStatusBarBase implementation
@@ -65,7 +62,7 @@ wxStatusBarBase::~wxStatusBarBase()
 
     // 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);
@@ -358,4 +355,3 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
 }
 
 #endif // wxUSE_STATUSBAR
-