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 a8ad8868c82f5330d92172269a3c8865ad3cc3b9..0dee67251b60d710ec495f5989452c4acbed7ad0 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)

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


@@ -58,7 +58,7 @@ wxStatusBarBase::~wxStatusBarBase()
 {
     // notify the frame that it doesn't have a status bar any longer to avoid
     // dangling pointers
 {
     // notify the frame that it doesn't have a status bar any longer to avoid
     // dangling pointers

-    wxFrame *frame = dynamic_cast<wxFrame*>(GetParent());
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

     if ( frame && frame->GetStatusBar() == this )
         frame->SetStatusBar(NULL);
 }
     if ( frame && frame->GetStatusBar() == this )
         frame->SetStatusBar(NULL);
 }


@@ -71,8 +71,6 @@ 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 ( (size_t)number > m_panes.GetCount() )
     {
         wxStatusBarPane newPane;


@@ -88,45 +86,42 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
         m_panes.RemoveAt(number, m_panes.GetCount()-number);
     }
 
         m_panes.RemoveAt(number, m_panes.GetCount()-number);
     }
 

-    refresh = true;
-
-    if ( widths )
-    {
-        SetStatusWidths(number, widths);
-
-        // already done from SetStatusWidths()
-        refresh = false;
-    }
-
-    if ( refresh )
-        Refresh();
+    // SetStatusWidths will automatically refresh
+    SetStatusWidths(number, widths);

 }
 
 void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
 }
 
 void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),

-                                      const int widths[])
+                                    const int widths[])

 {
 {

-    wxCHECK_RET( widths, _T("NULL pointer in SetStatusWidths") );
-

     wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 
     wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 

-    for ( size_t i = 0; i < m_panes.GetCount(); i++ )
-        m_panes[i].nWidth = widths[i];
+    if (widths == NULL)
+    {
+        // 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];

 
 

-    m_bSameWidthForAllPanes = false;
+        m_bSameWidthForAllPanes = false;
+    }

 
     // update the display after the widths changed
     Refresh();
 }
 
 void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
 
     // update the display after the widths changed
     Refresh();
 }
 
 void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),

-                                      const int styles[])
+                                    const int styles[])

 {
     wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );
 
     wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 
     for ( size_t i = 0; i < m_panes.GetCount(); i++ )
 {
     wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );
 
     wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 
     for ( size_t i = 0; i < m_panes.GetCount(); i++ )

-        m_panes[i].nStyle = styles[i];
+        m_panes[i].m_nStyle = styles[i];

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


@@ -158,15 +153,15 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
         // calculate the total width of all the fixed width fields and the
         // total number of var field widths counting with multiplicity
         size_t nTotalWidth = 0,
         // calculate the total width of all the fixed width fields and the
         // total number of var field widths counting with multiplicity
         size_t nTotalWidth = 0,

-               nVarCount = 0,
-               i;
+            nVarCount = 0,
+            i;

 
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {
 
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {

-            if ( m_panes[i].nWidth >= 0 )
-                nTotalWidth += m_panes[i].nWidth;
+            if ( m_panes[i].GetWidth() >= 0 )
+                nTotalWidth += m_panes[i].GetWidth();

             else
             else

-                nVarCount += -m_panes[i].nWidth;
+                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


@@ -175,12 +170,12 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
         // do fill the array
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {
         // do fill the array
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {

-            if ( m_panes[i].nWidth >= 0 )
-                widths.Add(m_panes[i].nWidth);
+            if ( m_panes[i].GetWidth() >= 0 )
+                widths.Add(m_panes[i].GetWidth());

             else
             {
             else
             {

-                int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].nWidth)) / nVarCount : 0;
-                nVarCount += m_panes[i].nWidth;
+                int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].GetWidth())) / nVarCount : 0;
+                nVarCount += m_panes[i].GetWidth();

                 widthExtra -= nVarWidth;
                 widths.Add(nVarWidth);
             }
                 widthExtra -= nVarWidth;
                 widths.Add(nVarWidth);
             }


@@ -196,19 +191,25 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {
 
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {

-    // save current status text in the stack
-    m_panes[number].arrStack.push_back(GetStatusText(number));
+    // save the new text (in non-ellipsized form) in the stack
+    m_panes[number].m_arrStack.push_back(text);

 
 

-    // update current status text

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

+        // update current status text (which will possibly be ellipsized) 
+        // also in the native control

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

-    wxString text = m_panes[number].arrStack.back();
-    m_panes[number].arrStack.pop_back();  // also remove it from the stack
+    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 popped status text in the pane
+    // restore the previous status text in the native control
+    const wxString& text = m_panes[number].m_arrStack.back();

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