ANSI+Unicode compatibility fixes to wxArrayString

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 8e51e041ba18122c3f83af81317459966ad85c05..3e91d47ec63f6afc18fc117b1d993fa10dc24c40 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -24,17 +24,19 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_STATUSBAR
+
 #include "wx/statusbr.h"
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 #endif //WX_PRECOMP
 
-#if wxUSE_STATUSBAR
-
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListString)
 
+const wxChar wxStatusBarNameStr[] = wxT("statusBar");
+
 // ============================================================================
 // wxStatusBarBase implementation
 // ============================================================================
@@ -220,12 +222,21 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
     {
         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
     }