X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..6f26925422c2de7938509657eb981d6f752a6249:/src/common/gbsizer.cpp diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp index 3a14dd4aa7..66c27e8299 100644 --- a/src/common/gbsizer.cpp +++ b/src/common/gbsizer.cpp @@ -278,7 +278,7 @@ wxGBPosition wxGridBagSizer::GetItemPosition(size_t index) { wxGBPosition badpos(-1,-1); wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, badpos, _T("Failed to find item.") ); + wxCHECK_MSG( node, badpos, wxT("Failed to find item.") ); wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); return item->GetPos(); } @@ -304,7 +304,7 @@ bool wxGridBagSizer::SetItemPosition(wxSizer *sizer, const wxGBPosition& pos) bool wxGridBagSizer::SetItemPosition(size_t index, const wxGBPosition& pos) { wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, false, _T("Failed to find item.") ); + wxCHECK_MSG( node, false, wxT("Failed to find item.") ); wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); return item->SetPos(pos); } @@ -315,7 +315,7 @@ wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window) { wxGBSpan badspan(-1,-1); wxGBSizerItem* item = FindItem(window); - wxCHECK_MSG( item, badspan, _T("Failed to find item.") ); + wxCHECK_MSG( item, badspan, wxT("Failed to find item.") ); return item->GetSpan(); } @@ -324,7 +324,7 @@ wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer) { wxGBSpan badspan(-1,-1); wxGBSizerItem* item = FindItem(sizer); - wxCHECK_MSG( item, badspan, _T("Failed to find item.") ); + wxCHECK_MSG( item, badspan, wxT("Failed to find item.") ); return item->GetSpan(); } @@ -333,7 +333,7 @@ wxGBSpan wxGridBagSizer::GetItemSpan(size_t index) { wxGBSpan badspan(-1,-1); wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, badspan, _T("Failed to find item.") ); + wxCHECK_MSG( node, badspan, wxT("Failed to find item.") ); wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); return item->GetSpan(); } @@ -359,7 +359,7 @@ bool wxGridBagSizer::SetItemSpan(wxSizer *sizer, const wxGBSpan& span) bool wxGridBagSizer::SetItemSpan(size_t index, const wxGBSpan& span) { wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, false, _T("Failed to find item.") ); + wxCHECK_MSG( node, false, wxT("Failed to find item.") ); wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); return item->SetSpan(span); } @@ -583,7 +583,7 @@ void wxGridBagSizer::RecalcSizes() void wxGridBagSizer::AdjustForOverflow() { int row, col; - + for (row=0; row<(int)m_rowHeights.GetCount(); row++) { int rowExtra=INT_MAX; @@ -597,7 +597,7 @@ void wxGridBagSizer::AdjustForOverflow() int endrow, endcol; item->GetEndPos(endrow, endcol); - + // If the item starts in this position and doesn't span rows, then // just look at the whole item height if ( item->GetPos() == pos && endrow == row ) @@ -617,7 +617,7 @@ void wxGridBagSizer::AdjustForOverflow() if ( itemHeight < 0 ) itemHeight = 0; - + // and check how much is left rowExtra = wxMin(rowExtra, rowHeight - itemHeight); } @@ -640,7 +640,7 @@ void wxGridBagSizer::AdjustForOverflow() int endrow, endcol; item->GetEndPos(endrow, endcol); - + if ( item->GetPos() == pos && endcol == col ) { int itemWidth = item->CalcMin().GetWidth(); @@ -656,7 +656,7 @@ void wxGridBagSizer::AdjustForOverflow() if ( itemWidth < 0 ) itemWidth = 0; - + colExtra = wxMin(colExtra, colWidth - itemWidth); } } @@ -664,7 +664,7 @@ void wxGridBagSizer::AdjustForOverflow() m_colWidths[col] -= colExtra; } - + } //---------------------------------------------------------------------------