added wxWS_EX_VALIDATE_RECURSIVELY

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 944b7979c198f6e3ff01c0d7754a51f26ae15be2..0544a98b67530e815a1049dfb1ccbed8dfdfb6b4 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>
 // 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
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "statbar.h"
 #endif
 
     #pragma implementation "statbar.h"
 #endif
 


@@ -29,6 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/frame.h"

     #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 
     #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 


@@ -53,12 +54,22 @@ wxStatusBarBase::wxStatusBarBase()
 
     InitWidths();
     InitStacks();
 
     InitWidths();
     InitStacks();

+    InitStyles();

 }
 
 wxStatusBarBase::~wxStatusBarBase()
 {
     FreeWidths();
     FreeStacks();
 }
 
 wxStatusBarBase::~wxStatusBarBase()
 {
     FreeWidths();
     FreeStacks();

+    FreeStyles();
+
+    // notify the frame that it doesn't have a status bar any longer to avoid
+    // dangling pointers
+    wxFrameBase *frame = wxDynamicCast(GetParent(), wxFrameBase);
+    if ( frame && frame->GetStatusBar() == this )
+    {
+        frame->SetStatusBar(NULL);
+    }

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


@@ -75,6 +86,20 @@ void wxStatusBarBase::FreeWidths()
     delete [] m_statusWidths;
 }
 
     delete [] m_statusWidths;
 }
 

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

 // ----------------------------------------------------------------------------
 // field widths
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // field widths
 // ----------------------------------------------------------------------------


@@ -83,7 +108,7 @@ 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;
+    bool refresh = false;

 
     if ( number != m_nFields )
     {
 
     if ( number != m_nFields )
     {


@@ -112,11 +137,31 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
             m_statusTextStacks = newStacks;
         }
 
             m_statusTextStacks = newStacks;
         }
 

+        // 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();
 
         m_nFields = number;
 
         ReinitWidths();
 

-        refresh = TRUE;
+        refresh = true;

     }
     //else: keep the old m_statusWidths if we had them
 
     }
     //else: keep the old m_statusWidths if we had them
 


@@ -125,7 +170,7 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
         SetStatusWidths(number, widths);
 
         // already done from SetStatusWidths()
         SetStatusWidths(number, widths);
 
         // already done from SetStatusWidths()

-        refresh = FALSE;
+        refresh = false;

     }
 
     if ( refresh )
     }
 
     if ( refresh )


@@ -151,6 +196,25 @@ void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
     Refresh();
 }
 
     Refresh();
 }
 

+void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
+                                      const int styles[])
+{
+    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];
+
+    for ( int i = 0; i < m_nFields; i++ )
+    {
+        m_statusStyles[i] = styles[i];
+    }
+
+    // update the display after the widths changed
+    Refresh();
+}
+

 wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 {
     wxArrayInt widths;
 wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 {
     wxArrayInt widths;


@@ -188,16 +252,7 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
         }
 
         // 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
         for ( i = 0; i < m_nFields; i++ )
 
         // do fill the array
         for ( i = 0; i < m_nFields; i++ )


@@ -208,7 +263,10 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
             }
             else
             {
             }
             else
             {

-                widths.Add(-m_statusWidths[i]*nVarWidth);
+                int nVarWidth = widthExtra > 0 ? (widthExtra * -m_statusWidths[i]) / nVarCount : 0;
+                nVarCount += m_statusWidths[i];
+                widthExtra -= nVarWidth;
+                widths.Add(nVarWidth);

             }
         }
     }
             }
         }
     }


@@ -227,14 +285,15 @@ void wxStatusBarBase::InitStacks()
 
 void wxStatusBarBase::FreeStacks()
 {
 
 void wxStatusBarBase::FreeStacks()
 {

-    if(!m_statusTextStacks) return;
-    size_t i;
+    if ( !m_statusTextStacks )
+        return;

 
 

-    for(i = 0; i < (size_t)m_nFields; ++i)
+    for ( size_t i = 0; i < (size_t)m_nFields; ++i )

     {
     {

-        if(m_statusTextStacks[i])
+        if ( m_statusTextStacks[i] )

         {
         {

-            m_statusTextStacks[i]->Clear();
+            wxListString& t = *m_statusTextStacks[i];
+            WX_CLEAR_LIST(wxListString, t);

             delete m_statusTextStacks[i];
         }
     }
             delete m_statusTextStacks[i];
         }
     }


@@ -249,7 +308,11 @@ void wxStatusBarBase::FreeStacks()
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {
     wxListString* st = GetOrCreateStatusStack(number);
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {
     wxListString* st = GetOrCreateStatusStack(number);

-    st->Insert(new wxString(GetStatusText(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);
 }
 
     SetStatusText(text, number);
 }
 


@@ -257,10 +320,11 @@ void wxStatusBarBase::PopStatusText(int number)
 {
     wxListString *st = GetStatusStack(number);
     wxCHECK_RET( st, _T("Unbalanced PushStatusText/PopStatusText") );
 {
     wxListString *st = GetStatusStack(number);
     wxCHECK_RET( st, _T("Unbalanced PushStatusText/PopStatusText") );

-    wxListString::Node *top = st->GetFirst();
+    wxListString::compatibility_iterator top = st->GetFirst();

 
     SetStatusText(*top->GetData(), number);
 
     SetStatusText(*top->GetData(), number);

-    st->DeleteNode(top);
+    delete top->GetData();
+    st->Erase(top);

     if(st->GetCount() == 0)
     {
         delete st;
     if(st->GetCount() == 0)
     {
         delete st;


@@ -288,7 +352,6 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
     if(!m_statusTextStacks[i])
     {
         m_statusTextStacks[i] = new wxListString();
     if(!m_statusTextStacks[i])
     {
         m_statusTextStacks[i] = new wxListString();

-        m_statusTextStacks[i]->DeleteContents(TRUE);

     }
 
     return m_statusTextStacks[i];
     }
 
     return m_statusTextStacks[i];