Fixed a rare wxAuiFloatingFrame dtor crash on MSW using a registration mechanism...

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 984a9e127828edad75530babd3fb9060908c7c2c..3e91d47ec63f6afc18fc117b1d993fa10dc24c40 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/statbar.cpp
+// Name:        src/common/statbar.cpp

 // Purpose:     wxStatusBarBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxStatusBarBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -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,14 +24,18 @@
     #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
-

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListString);
+WX_DEFINE_LIST(wxListString)
+
+const wxChar wxStatusBarNameStr[] = wxT("statusBar");

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


@@ -53,12 +53,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
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && frame->GetStatusBar() == this )
+    {
+        frame->SetStatusBar(NULL);
+    }

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


@@ -75,6 +85,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 +107,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 +136,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 +169,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 +195,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;


@@ -159,12 +222,21 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
     {
         if ( m_nFields )
         {
     {
         if ( m_nFields )
         {

-            // 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_nFields) - if that happens, we distribute the extra pixels
+            // among all fields:
+            int widthToUse = widthTotal;
+
+            for ( int i = m_nFields; 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: we're empty anyhow
     }
         }
         //else: we're empty anyhow
     }


@@ -188,16 +260,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 +271,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,12 +293,12 @@ 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] )

         {
             wxListString& t = *m_statusTextStacks[i];
             WX_CLEAR_LIST(wxListString, t);
         {
             wxListString& t = *m_statusTextStacks[i];
             WX_CLEAR_LIST(wxListString, t);


@@ -300,4 +366,3 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
 }
 
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR

-