fixed computation of status bar fields width if the total width is not divisible...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index e1c4fd3dffb8a5445bfd923143cceeb6805581c4..3e91d47ec63f6afc18fc117b1d993fa10dc24c40 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -222,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
     }