correction to last commit: Korean and Romanian translations will only be in 2.9.1...

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index bd3a277d88e0fbba791ab95bd9ed61ab7f62cec3..0dee67251b60d710ec495f5989452c4acbed7ad0 100644 (file)
--- 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
 // 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>
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "statbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,11 +24,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATUSBAR
+
+#include "wx/statusbr.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/statusbr.h"
+    #include "wx/frame.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#if wxUSE_STATUSBAR
+const char wxStatusBarNameStr[] = "statusBar";
+

 
 // ============================================================================
 // wxStatusBarBase implementation
 
 // ============================================================================
 // wxStatusBarBase implementation


@@ -40,34 +41,26 @@
 
 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)
+
+

 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 
 wxStatusBarBase::wxStatusBarBase()
 {
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 
 wxStatusBarBase::wxStatusBarBase()
 {

-    m_nFields = 0;
-
-    InitWidths();
+    m_bSameWidthForAllPanes = true;

 }
 
 wxStatusBarBase::~wxStatusBarBase()
 {
 }
 
 wxStatusBarBase::~wxStatusBarBase()
 {

-    FreeWidths();
-}
-
-// ----------------------------------------------------------------------------
-// widths array handling
-// ----------------------------------------------------------------------------
-
-void wxStatusBarBase::InitWidths()
-{
-    m_statusWidths = NULL;
-}
-
-void wxStatusBarBase::FreeWidths()
-{
-    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);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -78,44 +71,57 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
 {
     wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") );
 
 {
     wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") );
 

-    bool refresh = FALSE;
+    if ( (size_t)number > m_panes.GetCount() )
+    {
+        wxStatusBarPane newPane;

 
 

-    if ( number != m_nFields )
+        // 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() )

     {
     {

-        m_nFields = number;
+        // remove entries in excess
+        m_panes.RemoveAt(number, m_panes.GetCount()-number);
+    }

 
 

-        ReinitWidths();
+    // SetStatusWidths will automatically refresh
+    SetStatusWidths(number, widths);
+}

 
 

-        refresh = TRUE;
-    }
-    //else: keep the old m_statusWidths if we had them
+void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
+                                    const int widths[])
+{
+    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );

 
 

-    if ( widths )
+    if (widths == NULL)

     {
     {

-        SetStatusWidths(number, widths);
+        // special value meaning: override explicit pane widths and make them all
+        // of the same size
+        m_bSameWidthForAllPanes = true;
+    }
+    else
+    {
+        for ( size_t i = 0; i < m_panes.GetCount(); i++ )
+            m_panes[i].m_nWidth = 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") );
-
-    wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
+    wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );

 
 

-    if ( !m_statusWidths )
-        m_statusWidths = new int[m_nFields];
+    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );

 
 

-    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].m_nStyle = styles[i];

 
     // update the display after the widths changed
     Refresh();
 
     // update the display after the widths changed
     Refresh();


@@ -125,56 +131,53 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 {
     wxArrayInt widths;
 
 {
     wxArrayInt widths;
 

-    if ( m_statusWidths == NULL )
+    if ( m_bSameWidthForAllPanes )

     {
     {

-        // default: all fields have the same width
-        int nWidth = widthTotal / m_nFields;
-        for ( int i = 0; i < m_nFields; i++ )
+        // 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-- )

         {
         {

-            widths.Add(nWidth);
+            // divide the unassigned width evently between the
+            // not yet processed fields:
+            int w = widthToUse / i;
+            widths.Add(w);
+            widthToUse -= w;

         }
     }
         }
     }

-    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
     {
         // 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;
             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
             else

-            {
-                nVarCount += -m_statusWidths[i];
-            }
+                nVarCount += -m_panes[i].GetWidth();

         }
 
         // the amount of extra width we have per each var width field
         }
 
         // 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
 
         // 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
             {
             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);

             }
         }
     }
             }
         }
     }


@@ -182,5 +185,32 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
     return widths;
 }
 
     return widths;
 }
 

-#endif // wxUSE_STATUSBAR
+// ----------------------------------------------------------------------------
+// status text stacks
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::PushStatusText(const wxString& text, int number)
+{
+    // save the new text (in non-ellipsized form) in the stack
+    m_panes[number].m_arrStack.push_back(text);
+
+    SetStatusText(text, number);
+        // update current status text (which will possibly be ellipsized) 
+        // also in the native control
+}
+
+void wxStatusBarBase::PopStatusText(int number)
+{
+    wxASSERT_MSG(m_panes[number].m_arrStack.GetCount() >= 1,
+                 "can't pop any further string");
+
+    // the top of the stack is the status text currently shown in the native control;
+    // remove it
+    m_panes[number].m_arrStack.pop_back();

 
 

+    // restore the previous status text in the native control
+    const wxString& text = m_panes[number].m_arrStack.back();
+    SetStatusText(text, number);
+}
+
+#endif // wxUSE_STATUSBAR