X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80fdcdb90ef779185492dab676d461fc34933312..bf2c43c76e2819be443ab1d830ab68d9569d66b1:/src/common/gbsizer.cpp?ds=sidebyside diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp index d9451c0983..1a1dda0928 100644 --- a/src/common/gbsizer.cpp +++ b/src/common/gbsizer.cpp @@ -6,7 +6,6 @@ // // Author: Robin Dunn // Created: 03-Nov-2003 -// RCS-ID: $Id$ // Copyright: (c) Robin Dunn // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -312,27 +311,24 @@ bool wxGridBagSizer::SetItemPosition(size_t index, const wxGBPosition& pos) wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window) { - wxGBSpan badspan(-1,-1); wxGBSizerItem* item = FindItem(window); - wxCHECK_MSG( item, badspan, wxT("Failed to find item.") ); + wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") ); return item->GetSpan(); } wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer) { - wxGBSpan badspan(-1,-1); wxGBSizerItem* item = FindItem(sizer); - wxCHECK_MSG( item, badspan, wxT("Failed to find item.") ); + wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") ); return item->GetSpan(); } wxGBSpan wxGridBagSizer::GetItemSpan(size_t index) { - wxGBSpan badspan(-1,-1); wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, badspan, wxT("Failed to find item.") ); + wxCHECK_MSG( node, wxGBSpan::Invalid(), wxT("Failed to find item.") ); wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); return item->GetSpan(); } @@ -471,7 +467,7 @@ wxSize wxGridBagSizer::CalcMin() item->GetPos(row, col); item->GetEndPos(endrow, endcol); - // fill heights and widths upto this item if needed + // fill heights and widths up to this item if needed while ( (int)m_rowHeights.GetCount() <= endrow ) m_rowHeights.Add(m_emptyCellSize.GetHeight()); while ( (int)m_colWidths.GetCount() <= endcol )