X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a079bc1f092f865c9fd5ef37f207ab5e525c1b1..74b965198ce3a4257deac901b6f7517e6447ca0f:/src/common/gbsizer.cpp
diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 7d1faa5fe4..66c27e8299 100644
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -187,7 +187,7 @@ wxSizerItem* wxGridBagSizer::Add( wxWindow *window,
else
{
delete item;
- return (wxSizerItem*)NULL;
+ return NULL;
}
}
@@ -201,7 +201,7 @@ wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer,
else
{
delete item;
- return (wxSizerItem*)NULL;
+ return NULL;
}
}
@@ -215,7 +215,7 @@ wxSizerItem* wxGridBagSizer::Add( int width, int height,
else
{
delete item;
- return (wxSizerItem*)NULL;
+ return NULL;
}
}
@@ -228,6 +228,18 @@ wxSizerItem* wxGridBagSizer::Add( wxGBSizerItem *item )
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;
}
@@ -266,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();
}
@@ -292,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);
}
@@ -303,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();
}
@@ -312,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();
}
@@ -321,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();
}
@@ -347,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);
}
@@ -571,26 +583,26 @@ void wxGridBagSizer::RecalcSizes()
void wxGridBagSizer::AdjustForOverflow()
{
int row, col;
-
- for (row=0; row<m_rowHeights.GetCount(); row++)
+
+ for (row=0; row<(int)m_rowHeights.GetCount(); row++)
{
int rowExtra=INT_MAX;
int rowHeight = m_rowHeights[row];
- for (col=0; col<m_colWidths.GetCount(); col++)
+ for (col=0; col<(int)m_colWidths.GetCount(); col++)
{
wxGBPosition pos(row,col);
wxGBSizerItem* item = FindItemAtPosition(pos);
- if ( !item )
+ 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->GetSize().GetHeight();
+ int itemHeight = item->CalcMin().GetHeight();
rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
continue;
}
@@ -599,13 +611,13 @@ void wxGridBagSizer::AdjustForOverflow()
if ( endrow == row )
{
// first deduct the portions of the item that are on prior rows
- int itemHeight = item->GetSize().GetHeight();
+ 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);
}
@@ -615,36 +627,36 @@ void wxGridBagSizer::AdjustForOverflow()
}
// Now do the same thing for columns
- for (col=0; col<m_colWidths.GetCount(); col++)
+ for (col=0; col<(int)m_colWidths.GetCount(); col++)
{
int colExtra=INT_MAX;
int colWidth = m_colWidths[col];
- for (row=0; row<m_rowHeights.GetCount(); row++)
+ for (row=0; row<(int)m_rowHeights.GetCount(); row++)
{
wxGBPosition pos(row,col);
wxGBSizerItem* item = FindItemAtPosition(pos);
- if ( !item )
+ if ( !item || !item->IsShown() )
continue;
int endrow, endcol;
item->GetEndPos(endrow, endcol);
-
+
if ( item->GetPos() == pos && endcol == col )
{
- int itemWidth = item->GetSize().GetWidth();
+ int itemWidth = item->CalcMin().GetWidth();
colExtra = wxMin(colExtra, colWidth - itemWidth);
continue;
}
if ( endcol == col )
{
- int itemWidth = item->GetSize().GetWidth();
+ 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);
}
}
@@ -652,7 +664,7 @@ void wxGridBagSizer::AdjustForOverflow()
m_colWidths[col] -= colExtra;
}
-
+
}
//---------------------------------------------------------------------------
@@ -729,56 +741,56 @@ wxSizerItem* wxGridBagSizer::Add( int width, int height, int, int flag, int bord
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;
}