fixing modal dialog quit after nested message box problem

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 0544a98b67530e815a1049dfb1ccbed8dfdfb6b4..c8e47cec57cb757246105a801418017d0d68cc50 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// 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>


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


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

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

 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"

-    #include "wx/statusbr.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

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

 
 

-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListString);

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


@@ -44,60 +41,26 @@ WX_DEFINE_LIST(wxListString);
 
 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_EXPORTED_OBJARRAY(wxStatusBarPaneArray)
+
+

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

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

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

-    FreeWidths();
-    FreeStacks();
-    FreeStyles();
-

     // 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

-    wxFrameBase *frame = wxDynamicCast(GetParent(), wxFrameBase);
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

     if ( frame && frame->GetStatusBar() == this )
     if ( frame && frame->GetStatusBar() == this )

-    {

         frame->SetStatusBar(NULL);
         frame->SetStatusBar(NULL);

-    }
-}
-
-// ----------------------------------------------------------------------------
-// widths array handling
-// ----------------------------------------------------------------------------
-
-void wxStatusBarBase::InitWidths()
-{
-    m_statusWidths = NULL;
-}
-
-void wxStatusBarBase::FreeWidths()
-{
-    delete [] m_statusWidths;
-}
-
-// ----------------------------------------------------------------------------
-// styles array handling
-// ----------------------------------------------------------------------------
-
-void wxStatusBarBase::InitStyles()
-{
-    m_statusStyles = NULL;
-}
-
-void wxStatusBarBase::FreeStyles()
-{
-    delete [] m_statusStyles;

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


@@ -108,88 +71,42 @@ 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 ( 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;
-
-            m_statusTextStacks = newStacks;
-        }
+        wxStatusBarPane newPane;

 
 

-        // Resize styles array
-        if (m_statusStyles)
-        {
-            int *oldStyles = m_statusStyles;
-            m_statusStyles = new int[number];
-            int i, max = wxMin(number, m_nFields);
-
-            // copy old styles
-            for (i = 0; i < max; ++i)
-                m_statusStyles[i] = oldStyles[i];
-
-            // initialize new styles to wxSB_NORMAL
-            for (i = max; i < number; ++i)
-                m_statusStyles[i] = wxSB_NORMAL;
-
-            // free old styles
-            delete [] oldStyles;
-        }
-
-
-        m_nFields = number;
-
-        ReinitWidths();
-
-        refresh = true;
+        // 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: keep the old m_statusWidths if we had them
-
-    if ( widths )
+    else if ( (size_t)number < m_panes.GetCount() )

     {
     {

-        SetStatusWidths(number, widths);
-
-        // already done from SetStatusWidths()
-        refresh = false;
+        // remove entries in excess
+        m_panes.RemoveAt(number, m_panes.GetCount()-number);

     }
 
     }
 

-    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( n == m_nFields, _T("field number mismatch") );
+    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );

 
 

-    if ( !m_statusWidths )
-        m_statusWidths = new int[m_nFields];
-
-    for ( int i = 0; i < m_nFields; i++ )
+    if (widths == NULL)
+    {
+        // special value meaning: override explicit pane widths and make them all
+        // of the same size
+        m_bSameWidthForAllPanes = true;
+    }
+    else

     {
     {

-        m_statusWidths[i] = widths[i];
+        for ( size_t i = 0; i < m_panes.GetCount(); i++ )
+            m_panes[i].m_nWidth = widths[i];
+
+        m_bSameWidthForAllPanes = false;

     }
 
     // update the display after the widths changed
     }
 
     // update the display after the widths changed


@@ -197,19 +114,14 @@ void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
 }
 
 void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
 }
 
 void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),

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

 {
     wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );
 
 {
     wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );
 

-    wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
-
-    if ( !m_statusStyles )
-        m_statusStyles = 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_statusStyles[i] = styles[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();


@@ -219,52 +131,51 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 {
     wxArrayInt widths;
 
 {
     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
     {
         // 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
         int widthExtra = widthTotal - nTotalWidth;
 
         // do fill the array
         }
 
         // the amount of extra width we have per each var width field
         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
             {
             else
             {

-                int nVarWidth = widthExtra > 0 ? (widthExtra * -m_statusWidths[i]) / nVarCount : 0;
-                nVarCount += m_statusWidths[i];
+                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);
             }


@@ -275,87 +186,48 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// text stacks handling
-// ----------------------------------------------------------------------------
-
-void wxStatusBarBase::InitStacks()
-{
-    m_statusTextStacks = NULL;
-}
-
-void wxStatusBarBase::FreeStacks()
-{
-    if ( !m_statusTextStacks )
-        return;
-
-    for ( size_t 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
+// status text stacks

 // ----------------------------------------------------------------------------
 
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {
 // ----------------------------------------------------------------------------
 
 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);
-}
+    // save the new text (in non-ellipsized form) in the stack
+    m_panes[number].m_arrStack.push_back(text);

 
 

-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;
-    }
-}
+    SetStatusText(text, number);
+        // update current status text (which will possibly be ellipsized) 
+        // also in the native control

 
 

-wxListString *wxStatusBarBase::GetStatusStack(int i) const
-{
-    if(!m_statusTextStacks)
-        return 0;
-    return m_statusTextStacks[i];
+    // SetStatusText() typically has an optimization built-in to avoid flickering
+    // which won't refresh the status bar pane if the current top of the stack
+    // is identic to the text passed to that function.
+    // Since this optimization however cannot detect push/pop operations on the stack
+    // we need to explicitely refresh the status bar pane ourselves:
+    wxRect rect;
+    GetFieldRect(number, rect);
+    Refresh(true, &rect);
+    Update();

 }
 
 }
 

-wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
+void wxStatusBarBase::PopStatusText(int number)

 {
 {

-    if(!m_statusTextStacks)
-    {
-        m_statusTextStacks = new wxListString*[m_nFields];
+    wxASSERT_MSG(m_panes[number].m_arrStack.GetCount() > 1,
+                 "can't pop any further string");

 
 

-        size_t j;
-        for(j = 0; j < (size_t)m_nFields; ++j) m_statusTextStacks[j] = 0;
-    }
+    // the top of the stack is the status text currently shown in the native control;
+    // remove it
+    m_panes[number].m_arrStack.pop_back();

 
 

-    if(!m_statusTextStacks[i])
-    {
-        m_statusTextStacks[i] = new wxListString();
-    }
+    // restore the previous status text in the native control
+    const wxString& text = m_panes[number].m_arrStack.back();
+    SetStatusText(text, number);

 
 

-    return m_statusTextStacks[i];
+    // see comment in wxStatusBarBase::PushStatusText about why we need to explicitely
+    // refresh the status bar pane
+    wxRect rect;
+    GetFieldRect(number, rect);
+    Refresh(true, &rect);
+    Update();

 }
 
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR

-