// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gbsizer.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
else
{
delete item;
- return (wxSizerItem*)NULL;
+ return NULL;
}
}
else
{
delete item;
- return (wxSizerItem*)NULL;
+ return NULL;
}
}
else
{
delete item;
- return (wxSizerItem*)NULL;
+ return NULL;
}
}
if ( item->GetWindow() )
item->GetWindow()->SetContainingSizer( this );
+ // extend the number of rows/columns of the underlying wxFlexGridSizer if
+ // necessary
+ int row, col;
+ item->GetEndPos(row, col);
+ row++;
+ col++;
+
+ if ( row > GetRows() )
+ SetRows(row);
+ if ( col > GetCols() )
+ SetCols(col);
+
return item;
}
{
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();
}
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);
}
{
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();
}
{
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();
}
{
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();
}
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);
}
wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
wxRect rect(item->GetPosition(), item->GetSize());
rect.Inflate(m_hgap, m_vgap);
- if ( rect.Inside(pt) )
+ if ( rect.Contains(pt) )
return item;
node = node->GetNext();
}
node = node->GetNext();
}
+ AdjustForOverflow();
AdjustForFlexDirection();
// Now traverse the heights and widths arrays calcing the totals, including gaps
m_cols = m_colWidths.GetCount();
int idx, width, height;
- AdjustForGrowables(sz, m_calculatedMinSize, m_rows, m_cols);
+ AdjustForGrowables(sz);
// Find the start positions on the window of the rows and columns
wxArrayInt rowpos;
{
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();
}
}
+// Sometimes CalcMin can result in some rows or cols having too much space in
+// them because as it traverses the items it makes some assumptions when
+// items span to other cells. But those assumptions can become invalid later
+// on when other items are fitted into the same rows or columns that the
+// spanning item occupies. This method tries to find those situations and
+// fixes them.
+void wxGridBagSizer::AdjustForOverflow()
+{
+ int row, col;
+
+ for (row=0; row<(int)m_rowHeights.GetCount(); row++)
+ {
+ int rowExtra=INT_MAX;
+ int rowHeight = m_rowHeights[row];
+ for (col=0; col<(int)m_colWidths.GetCount(); col++)
+ {
+ wxGBPosition pos(row,col);
+ wxGBSizerItem* item = FindItemAtPosition(pos);
+ if ( !item || !item->IsShown() )
+ continue;
+
+ 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 )
+ {
+ int itemHeight = item->CalcMin().GetHeight();
+ rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
+ continue;
+ }
+
+ // Otherwise, only look at spanning items if they end on this row
+ if ( endrow == row )
+ {
+ // first deduct the portions of the item that are on prior rows
+ int itemHeight = item->CalcMin().GetHeight();
+ for (int r=item->GetPos().GetRow(); r<row; r++)
+ itemHeight -= (m_rowHeights[r] + GetHGap());
+
+ if ( itemHeight < 0 )
+ itemHeight = 0;
+
+ // and check how much is left
+ rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
+ }
+ }
+ if ( rowExtra && rowExtra != INT_MAX )
+ m_rowHeights[row] -= rowExtra;
+ }
+
+ // Now do the same thing for columns
+ for (col=0; col<(int)m_colWidths.GetCount(); col++)
+ {
+ int colExtra=INT_MAX;
+ int colWidth = m_colWidths[col];
+ for (row=0; row<(int)m_rowHeights.GetCount(); row++)
+ {
+ wxGBPosition pos(row,col);
+ wxGBSizerItem* item = FindItemAtPosition(pos);
+ if ( !item || !item->IsShown() )
+ continue;
+
+ int endrow, endcol;
+ item->GetEndPos(endrow, endcol);
+
+ if ( item->GetPos() == pos && endcol == col )
+ {
+ int itemWidth = item->CalcMin().GetWidth();
+ colExtra = wxMin(colExtra, colWidth - itemWidth);
+ continue;
+ }
+
+ if ( endcol == col )
+ {
+ int itemWidth = item->CalcMin().GetWidth();
+ for (int c=item->GetPos().GetCol(); c<col; c++)
+ itemWidth -= (m_colWidths[c] + GetVGap());
+
+ if ( itemWidth < 0 )
+ itemWidth = 0;
+
+ colExtra = wxMin(colExtra, colWidth - itemWidth);
+ }
+ }
+ if ( colExtra && colExtra != INT_MAX )
+ m_colWidths[col] -= colExtra;
+ }
+
+
+}
//---------------------------------------------------------------------------
wxSizerItem* wxGridBagSizer::Add( wxSizerItem * )
{
wxFAIL_MSG(wxT("Invalid Add form called."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Prepend( wxWindow *, int, int, int, wxObject* )
{
wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Prepend( wxSizer *, int, int, int, wxObject* )
{
wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Prepend( int, int, int, int, int, wxObject* )
{
wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Prepend( wxSizerItem * )
{
wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Insert( size_t, wxWindow *, int, int, int, wxObject* )
{
wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizer *, int, int, int, wxObject* )
{
wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Insert( size_t, int, int, int, int, int, wxObject* )
{
wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizerItem * )
{
wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
- return (wxSizerItem*)NULL;
+ return NULL;
}
projects / wxWidgets.git / blobdiff