X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..8472511246c9160d4ff40ab86f635fc67c10b54a:/src/common/statbar.cpp

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 238802c0c2..d196f15933 100644
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/statbar.cpp
+// Name:        src/common/statbar.cpp
 // Purpose:     wxStatusBarBase implementation
 // Author:      Vadim Zeitlin
-// Modified by:
+// Modified by: Francesco Montorsi
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -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,51 +24,111 @@
     #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);
+const char wxStatusBarNameStr[] = "statusBar";
 
 // ============================================================================
-// wxStatusBarBase implementation
+// wxStatusBarPane implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
+bool wxStatusBarPane::SetText(const wxString& text)
+{
+    if ( text == m_text )
+        return false;
+
+    /*
+        If we have a message to restore on the stack, we update it to
+        correspond to the current one so that a sequence of calls such as
+
+        1. SetStatusText("foo")
+        2. PushStatusText("bar")
+        3. SetStatusText("new foo")
+        4. PopStatusText()
+
+        doesn't overwrite the "new foo" which should be shown at the end with
+        the old value "foo". This would be unexpected and hard to avoid,
+        especially when PushStatusText() is used internally by wxWidgets
+        without knowledge of the user program, as it is for showing the menu
+        and toolbar help strings.
+
+        By updating the top of the stack we ensure that the next call to
+        PopStatusText() basically becomes a NOP without breaking the balance
+        between the calls to push and pop as we would have done if we really
+        called PopStatusText() here.
+     */
+    if ( !m_arrStack.empty() )
+    {
+        m_arrStack.back() = text;
+    }
 
-// ----------------------------------------------------------------------------
-// ctor/dtor
-// ----------------------------------------------------------------------------
+    m_text = text;
 
-wxStatusBarBase::wxStatusBarBase()
+    return true;
+}
+
+bool wxStatusBarPane::PushText(const wxString& text)
 {
-    m_nFields = 0;
+    // save the currently shown text
+    m_arrStack.push_back(m_text);
 
-    InitWidths();
-    InitStacks();
+    // and update the new one if necessary
+    if ( text == m_text )
+        return false;
+
+    m_text = text;
+
+    return true;
 }
 
-wxStatusBarBase::~wxStatusBarBase()
+bool wxStatusBarPane::PopText()
 {
-    FreeWidths();
-    FreeStacks();
+    wxCHECK_MSG( !m_arrStack.empty(), false, "no status message to pop" );
+
+    const wxString text = m_arrStack.back();
+
+    m_arrStack.pop_back();
+
+    if ( text == m_text )
+        return false;
+
+    m_text = text;
+
+    return true;
 }
 
+// ============================================================================
+// wxStatusBarBase implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
+
+#include "wx/arrimpl.cpp" // This is a magic incantation which must be done!
+WX_DEFINE_EXPORTED_OBJARRAY(wxStatusBarPaneArray)
+
+
 // ----------------------------------------------------------------------------
-// widths array handling
+// ctor/dtor
 // ----------------------------------------------------------------------------
 
-void wxStatusBarBase::InitWidths()
+wxStatusBarBase::wxStatusBarBase()
 {
-    m_statusWidths = NULL;
+    m_bSameWidthForAllPanes = true;
 }
 
-void wxStatusBarBase::FreeWidths()
+wxStatusBarBase::~wxStatusBarBase()
 {
-    delete [] m_statusWidths;
+    // notify the frame that it doesn't have a status bar any longer to avoid
+    // dangling pointers
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && frame->GetStatusBar() == this )
+        frame->SetStatusBar(NULL);
 }
 
 // ----------------------------------------------------------------------------
@@ -81,71 +137,59 @@ void wxStatusBarBase::FreeWidths()
 
 void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
 {
-    wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") );
-
-    bool refresh = FALSE;
+    wxCHECK_RET( number > 0, wxT("invalid field number in SetFieldsCount") );
 
-    if ( number != m_nFields )
+    if ( (size_t)number > m_panes.GetCount() )
     {
-        // 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;
+        wxStatusBarPane newPane;
 
-            m_statusTextStacks = newStacks;
-        }
+        // add more entries with the default style and zero width
+        // (this will be set later)
+        for (size_t i = m_panes.GetCount(); i < (size_t)number; ++i)
+            m_panes.Add(newPane);
+    }
+    else if ( (size_t)number < m_panes.GetCount() )
+    {
+        // remove entries in excess
+        m_panes.RemoveAt(number, m_panes.GetCount()-number);
+    }
 
-        m_nFields = number;
+    // SetStatusWidths will automatically refresh
+    SetStatusWidths(number, widths);
+}
 
-        ReinitWidths();
+void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
+                                    const int widths[])
+{
+    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), wxT("field number mismatch") );
 
-        refresh = TRUE;
+    if (widths == NULL)
+    {
+        // special value meaning: override explicit pane widths and make them all
+        // of the same size
+        m_bSameWidthForAllPanes = true;
     }
-    //else: keep the old m_statusWidths if we had them
-
-    if ( widths )
+    else
     {
-        SetStatusWidths(number, widths);
+        for ( size_t i = 0; i < m_panes.GetCount(); i++ )
+            m_panes[i].SetWidth(widths[i]);
 
-        // already done from SetStatusWidths()
-        refresh = FALSE;
+        m_bSameWidthForAllPanes = false;
     }
 
-    if ( refresh )
-        Refresh();
+    // update the display after the widths changed
+    Refresh();
 }
 
-void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
-                                      const int widths[])
+void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
+                                    const int styles[])
 {
-    wxCHECK_RET( widths, _T("NULL pointer in SetStatusWidths") );
+    wxCHECK_RET( styles, wxT("NULL pointer in SetStatusStyles") );
 
-    wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
+    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), wxT("field number mismatch") );
 
-    if ( !m_statusWidths )
-        m_statusWidths = new int[m_nFields];
-
-    for ( int i = 0; i < m_nFields; i++ )
-    {
-        m_statusWidths[i] = widths[i];
-    }
+    for ( size_t i = 0; i < m_panes.GetCount(); i++ )
+        m_panes[i].SetStyle(styles[i]);
 
     // update the display after the widths changed
     Refresh();
@@ -155,60 +199,53 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 {
     wxArrayInt widths;
 
-    if ( m_statusWidths == NULL )
+    if ( m_bSameWidthForAllPanes )
     {
-        if ( m_nFields )
+        // Default: all fields have the same width. This is not always
+        // possible to do exactly (if widthTotal is not divisible by
+        // m_panes.GetCount()) - if that happens, we distribute the extra
+        // pixels among all fields:
+        int widthToUse = widthTotal;
+
+        for ( size_t i = m_panes.GetCount(); i > 0; i-- )
         {
-            // default: all fields have the same width
-            int nWidth = widthTotal / m_nFields;
-            for ( int i = 0; i < m_nFields; i++ )
-            {
-                widths.Add(nWidth);
-            }
+            // divide the unassigned width evently between the
+            // not yet processed fields:
+            int w = widthToUse / i;
+            widths.Add(w);
+            widthToUse -= w;
         }
-        //else: we're empty anyhow
     }
-    else // have explicit status widths
+    else // do not override explicit pane widths
     {
         // calculate the total width of all the fixed width fields and the
         // total number of var field widths counting with multiplicity
-        int nTotalWidth = 0,
+        size_t nTotalWidth = 0,
             nVarCount = 0,
             i;
-        for ( i = 0; i < m_nFields; i++ )
+
+        for ( i = 0; i < m_panes.GetCount(); i++ )
         {
-            if ( m_statusWidths[i] >= 0 )
-            {
-                nTotalWidth += m_statusWidths[i];
-            }
+            if ( m_panes[i].GetWidth() >= 0 )
+                nTotalWidth += m_panes[i].GetWidth();
             else
-            {
-                nVarCount += -m_statusWidths[i];
-            }
+                nVarCount += -m_panes[i].GetWidth();
         }
 
         // the amount of extra width we have per each var width field
-        int nVarWidth;
-        if ( nVarCount )
-        {
-            int widthExtra = widthTotal - nTotalWidth;
-            nVarWidth = widthExtra > 0 ? widthExtra / nVarCount : 0;
-        }
-        else // no var width fields at all
-        {
-            nVarWidth = 0;
-        }
+        int widthExtra = widthTotal - nTotalWidth;
 
         // do fill the array
-        for ( i = 0; i < m_nFields; i++ )
+        for ( i = 0; i < m_panes.GetCount(); i++ )
         {
-            if ( m_statusWidths[i] >= 0 )
-            {
-                widths.Add(m_statusWidths[i]);
-            }
+            if ( m_panes[i].GetWidth() >= 0 )
+                widths.Add(m_panes[i].GetWidth());
             else
             {
-                widths.Add(-m_statusWidths[i]*nVarWidth);
+                int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].GetWidth())) / nVarCount : 0;
+                nVarCount += m_panes[i].GetWidth();
+                widthExtra -= nVarWidth;
+                widths.Add(nVarWidth);
             }
         }
     }
@@ -217,83 +254,54 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 }
 
 // ----------------------------------------------------------------------------
-// text stacks handling
+// setting/getting status text
 // ----------------------------------------------------------------------------
 
-void wxStatusBarBase::InitStacks()
+void wxStatusBarBase::SetStatusText(const wxString& text, int number)
 {
-    m_statusTextStacks = NULL;
+    wxCHECK_RET( (unsigned)number < m_panes.size(),
+                    "invalid status bar field index" );
+
+    if ( m_panes[number].SetText(text) )
+        DoUpdateStatusText(number);
 }
 
-void wxStatusBarBase::FreeStacks()
+wxString wxStatusBarBase::GetStatusText(int number) const
 {
-    if(!m_statusTextStacks) return;
-    size_t i;
+    wxCHECK_MSG( (unsigned)number < m_panes.size(), wxString(),
+                    "invalid status bar field index" );
 
-    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];
-        }
-    }
+    return m_panes[number].GetText();
+}
+
+void wxStatusBarBase::SetEllipsizedFlag(int number, bool isEllipsized)
+{
+    wxCHECK_RET( (unsigned)number < m_panes.size(),
+                    "invalid status bar field index" );
 
-    delete[] m_statusTextStacks;
+    m_panes[number].SetIsEllipsized(isEllipsized);
 }
 
 // ----------------------------------------------------------------------------
-// text stacks
+// pushing/popping status text
 // ----------------------------------------------------------------------------
 
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {
-    wxListString* st = GetOrCreateStatusStack(number);
-    st->Insert(new wxString(GetStatusText(number)));
-    SetStatusText(text, number);
-}
+    wxCHECK_RET( (unsigned)number < m_panes.size(),
+                    "invalid status bar field index" );
 
-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;
-    }
+    if ( m_panes[number].PushText(text) )
+        DoUpdateStatusText(number);
 }
 
-wxListString *wxStatusBarBase::GetStatusStack(int i) const
-{
-    if(!m_statusTextStacks)
-        return 0;
-    return m_statusTextStacks[i];
-}
-
-wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
+void wxStatusBarBase::PopStatusText(int number)
 {
-    if(!m_statusTextStacks)
-    {
-        m_statusTextStacks = new wxListString*[m_nFields];
+    wxCHECK_RET( (unsigned)number < m_panes.size(),
+                    "invalid status bar field index" );
 
-        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];
+    if ( m_panes[number].PopText() )
+        DoUpdateStatusText(number);
 }
 
 #endif // wxUSE_STATUSBAR
-