no real change; just reordered some implementations before real commit

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

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index e1c4fd3dffb8a5445bfd923143cceeb6805581c4..36f0ac976e0dad7dcaa2345538a5c008ba4ee280 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -35,7 +35,7 @@
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListString)
 
-const wxChar wxStatusBarNameStr[] = wxT("statusBar");
+const char wxStatusBarNameStr[] = "statusBar";
 
 // ============================================================================
 // wxStatusBarBase implementation
@@ -222,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
     }