oops, more fixes needed

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index bd3a277d88e0fbba791ab95bd9ed61ab7f62cec3..984a9e127828edad75530babd3fb9060908c7c2c 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -6,7 +6,7 @@
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "statbar.h"
 #endif
 
@@ -34,6 +34,9 @@
 
 #if wxUSE_STATUSBAR
 
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxListString);
+
 // ============================================================================
 // wxStatusBarBase implementation
 // ============================================================================
@@ -49,11 +52,13 @@ wxStatusBarBase::wxStatusBarBase()
     m_nFields = 0;
 
     InitWidths();
+    InitStacks();
 }
 
 wxStatusBarBase::~wxStatusBarBase()
 {
     FreeWidths();
+    FreeStacks();
 }
 
 // ----------------------------------------------------------------------------
@@ -82,6 +87,31 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
 
     if ( number != m_nFields )
     {
+        // copy stacks if present
+        if(m_statusTextStacks)
+        {
+            wxListString **newStacks = new wxListString*[number];
+            size_t i, j, max = wxMin(number, m_nFields);
+
+            // copy old stacks
+            for(i = 0; i < max; ++i)
+                newStacks[i] = m_statusTextStacks[i];
+            // free old stacks in excess
+            for(j = i; j < (size_t)m_nFields; ++j)
+            {
+                if(m_statusTextStacks[j])
+                {
+                    m_statusTextStacks[j]->Clear();
+                    delete m_statusTextStacks[j];
+                }
+            }
+            // initialize new stacks to NULL
+            for(j = i; j < (size_t)number; ++j)
+                newStacks[j] = 0;
+
+            m_statusTextStacks = newStacks;
+        }
+
         m_nFields = number;
 
         ReinitWidths();
@@ -127,12 +157,16 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 
     if ( m_statusWidths == NULL )
     {
-        // default: all fields have the same width
-        int nWidth = widthTotal / m_nFields;
-        for ( int i = 0; i < m_nFields; i++ )
+        if ( m_nFields )
         {
-            widths.Add(nWidth);
+            // default: all fields have the same width
+            int nWidth = widthTotal / m_nFields;
+            for ( int i = 0; i < m_nFields; i++ )
+            {
+                widths.Add(nWidth);
+            }
         }
+        //else: we're empty anyhow
     }
     else // have explicit status widths
     {
@@ -182,5 +216,88 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
     return widths;
 }
 
+// ----------------------------------------------------------------------------
+// text stacks handling
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::InitStacks()
+{
+    m_statusTextStacks = NULL;
+}
+
+void wxStatusBarBase::FreeStacks()
+{
+    if(!m_statusTextStacks) return;
+    size_t i;
+
+    for(i = 0; i < (size_t)m_nFields; ++i)
+    {
+        if(m_statusTextStacks[i])
+        {
+            wxListString& t = *m_statusTextStacks[i];
+            WX_CLEAR_LIST(wxListString, t);
+            delete m_statusTextStacks[i];
+        }
+    }
+
+    delete[] m_statusTextStacks;
+}
+
+// ----------------------------------------------------------------------------
+// text stacks
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::PushStatusText(const wxString& text, int number)
+{
+    wxListString* st = GetOrCreateStatusStack(number);
+    // This long-winded way around avoids an internal compiler error
+    // in VC++ 6 with RTTI enabled
+    wxString tmp1(GetStatusText(number));
+    wxString* tmp = new wxString(tmp1);
+    st->Insert(tmp);
+    SetStatusText(text, number);
+}
+
+void wxStatusBarBase::PopStatusText(int number)
+{
+    wxListString *st = GetStatusStack(number);
+    wxCHECK_RET( st, _T("Unbalanced PushStatusText/PopStatusText") );
+    wxListString::compatibility_iterator top = st->GetFirst();
+
+    SetStatusText(*top->GetData(), number);
+    delete top->GetData();
+    st->Erase(top);
+    if(st->GetCount() == 0)
+    {
+        delete st;
+        m_statusTextStacks[number] = 0;
+    }
+}
+
+wxListString *wxStatusBarBase::GetStatusStack(int i) const
+{
+    if(!m_statusTextStacks)
+        return 0;
+    return m_statusTextStacks[i];
+}
+
+wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
+{
+    if(!m_statusTextStacks)
+    {
+        m_statusTextStacks = new wxListString*[m_nFields];
+
+        size_t j;
+        for(j = 0; j < (size_t)m_nFields; ++j) m_statusTextStacks[j] = 0;
+    }
+
+    if(!m_statusTextStacks[i])
+    {
+        m_statusTextStacks[i] = new wxListString();
+    }
+
+    return m_statusTextStacks[i];
+}
+
 #endif // wxUSE_STATUSBAR