X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..b404a8f3b072129c107c6d9a5e0f6f53cd34807b:/src/common/gbsizer.cpp?ds=inline diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp index 66c27e8299..d9451c0983 100644 --- a/src/common/gbsizer.cpp +++ b/src/common/gbsizer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gbsizer.cpp +// Name: src/common/gbsizer.cpp // Purpose: wxGridBagSizer: A sizer that can lay out items in a grid, // with items at specified cells, and with the option of row // and/or column spanning @@ -76,7 +76,6 @@ wxGBSizerItem::wxGBSizerItem( wxSizer *sizer, wxGBSizerItem::wxGBSizerItem() : wxSizerItem(), m_pos(-1,-1), - m_span(-1,-1), m_gbsizer(NULL) { } @@ -473,9 +472,9 @@ wxSize wxGridBagSizer::CalcMin() item->GetEndPos(endrow, endcol); // fill heights and widths upto this item if needed - while ( m_rowHeights.GetCount() <= (size_t)endrow ) + while ( (int)m_rowHeights.GetCount() <= endrow ) m_rowHeights.Add(m_emptyCellSize.GetHeight()); - while ( m_colWidths.GetCount() <= (size_t)endcol ) + while ( (int)m_colWidths.GetCount() <= endcol ) m_colWidths.Add(m_emptyCellSize.GetWidth()); // See if this item increases the size of its row(s) or col(s)