From: Robin Dunn <robin@alldunn.com>
Date: Wed, 11 Apr 2007 21:53:13 +0000 (+0000)
Subject: Don't use hidden items for size calc (patch 1698314)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/af579c91c2cb87884e1afc66552bb243ce75aaa4

Don't use hidden items for size calc (patch 1698314)


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

diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 8188383c6a..ccde4a9a34 100644
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -537,20 +537,24 @@ void wxGridBagSizer::RecalcSizes()
     {
         int row, col, endrow, endcol;
         wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        item->GetPos(row, col);
-        item->GetEndPos(endrow, endcol);
 
-        height = 0;
-        for(idx=row; idx <= endrow; idx++)
-            height += m_rowHeights[idx];
-        height += (endrow - row) * m_vgap; // add a vgap for every row spanned
+        if ( item->IsShown() )
+        {
+            item->GetPos(row, col);
+            item->GetEndPos(endrow, endcol);
 
-        width = 0;
-        for (idx=col; idx <= endcol; idx++)
-            width += m_colWidths[idx];
-        width += (endcol - col) * m_hgap; // add a hgap for every col spanned
+            height = 0;
+            for(idx=row; idx <= endrow; idx++)
+                height += m_rowHeights[idx];
+            height += (endrow - row) * m_vgap; // add a vgap for every row spanned
 
-        SetItemBounds(item, colpos[col], rowpos[row], width, height);
+            width = 0;
+            for (idx=col; idx <= endcol; idx++)
+                width += m_colWidths[idx];
+            width += (endcol - col) * m_hgap; // add a hgap for every col spanned
+
+            SetItemBounds(item, colpos[col], rowpos[row], width, height);
+        }
 
         node = node->GetNext();
     }