don't leave gaps around hidden columns/rows in wxFlexGridSizer (closes bug 1659872...

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index af09c05b3e34a2c57ccd35813e951f4ceaa0bdbc..3b5c0f105df8b37e487dbb1f20f36b2aabeb4227 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1470,7 +1470,9 @@ void wxFlexGridSizer::AdjustForFlexDirection()
         // and now fill it with the largest value
         for ( n = 0; n < count; ++n )
         {
         // and now fill it with the largest value
         for ( n = 0; n < count; ++n )
         {

-            array[n] = largest;
+            // don't touch hidden rows
+            if ( array[n] != -1 )
+                array[n] = largest;

         }
     }
 }
         }
     }
 }


@@ -1510,9 +1512,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
             {
                 if (m_growableRows[idx] >= nrows )
                     continue;
             {
                 if (m_growableRows[idx] >= nrows )
                     continue;

-                if (m_rowHeights[ m_growableRows[idx] ] == -1)
-                    m_rowHeights[ m_growableRows[idx] ] = 0;
-                else
+                if (m_rowHeights[ m_growableRows[idx] ] != -1)

                 {
                     int delta = (sz.y - minsz.y);
                     if (sum_proportions == 0)
                 {
                     int delta = (sz.y - minsz.y);
                     if (sum_proportions == 0)


@@ -1562,9 +1562,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
             {
                 if (m_growableCols[idx] >= ncols )
                     continue;
             {
                 if (m_growableCols[idx] >= ncols )
                     continue;

-                if (m_colWidths[ m_growableCols[idx] ] == -1)
-                    m_colWidths[ m_growableCols[idx] ] = 0;
-                else
+                if (m_colWidths[ m_growableCols[idx] ] != -1)

                 {
                     int delta = (sz.x - minsz.x);
                     if (sum_proportions == 0)
                 {
                     int delta = (sz.x - minsz.x);
                     if (sum_proportions == 0)