PCH-less build fix

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 30af252d1442cde35fe99278fb0440b9c585614c..323ce920e048558ed816a5ab515e6519cbe9e0b3 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -41,8 +41,8 @@ const char wxStatusBarNameStr[] = "statusBar";
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
 

-#include <wx/arrimpl.cpp> // This is a magic incantation which must be done!
-WX_DEFINE_OBJARRAY(wxStatusBarPaneArray);
+#include "wx/arrimpl.cpp" // This is a magic incantation which must be done!
+WX_DEFINE_OBJARRAY(wxStatusBarPaneArray)

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -194,12 +194,15 @@ void wxStatusBarBase::PushStatusText(const wxString& text, int number)
     // save current status text in the stack
     m_panes[number].arrStack.push_back(GetStatusText(number));
 
     // save current status text in the stack
     m_panes[number].arrStack.push_back(GetStatusText(number));
 

-    // update current status text

     SetStatusText(text, number);
     SetStatusText(text, number);

+        // update current status text (eventually also in the native control)

 }
 
 void wxStatusBarBase::PopStatusText(int number)
 {
 }
 
 void wxStatusBarBase::PopStatusText(int number)
 {

+    wxASSERT_MSG(m_panes[number].arrStack.GetCount() == 1,
+                 "can't pop any further string");
+

     wxString text = m_panes[number].arrStack.back();
     m_panes[number].arrStack.pop_back();  // also remove it from the stack
 
     wxString text = m_panes[number].arrStack.back();
     m_panes[number].arrStack.pop_back();  // also remove it from the stack