Fix background drawing in EVT_ERASE_BACKGROUND handler in erase sample.

[wxWidgets.git] / src / common / gbsizer.cpp

diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 55a7226fc655c7b5e4cbbacb01cce76dac077d10..773c0f0ebc8ed1153f4f7a0781f5beab584e87fe 100644 (file)
--- 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
 // 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),
 wxGBSizerItem::wxGBSizerItem()
     : wxSizerItem(),
       m_pos(-1,-1),

-      m_span(-1,-1),

       m_gbsizer(NULL)
 {
 }
       m_gbsizer(NULL)
 {
 }


@@ -187,7 +186,7 @@ wxSizerItem* wxGridBagSizer::Add( wxWindow *window,
     else
     {
         delete item;
     else
     {
         delete item;

-        return (wxSizerItem*)NULL;
+        return NULL;

     }
 }
 
     }
 }
 


@@ -201,7 +200,7 @@ wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer,
     else
     {
         delete item;
     else
     {
         delete item;

-        return (wxSizerItem*)NULL;
+        return NULL;

     }
 }
 
     }
 }
 


@@ -215,7 +214,7 @@ wxSizerItem* wxGridBagSizer::Add( int width, int height,
     else
     {
         delete item;
     else
     {
         delete item;

-        return (wxSizerItem*)NULL;
+        return NULL;

     }
 }
 
     }
 }
 


@@ -228,6 +227,18 @@ wxSizerItem* wxGridBagSizer::Add( wxGBSizerItem *item )
     if ( item->GetWindow() )
         item->GetWindow()->SetContainingSizer( this );
 
     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;
 }
 
     return item;
 }
 


@@ -266,7 +277,7 @@ wxGBPosition wxGridBagSizer::GetItemPosition(size_t index)
 {
     wxGBPosition badpos(-1,-1);
     wxSizerItemList::compatibility_iterator node = m_children.Item( 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();
 }
     wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
     return item->GetPos();
 }


@@ -292,7 +303,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 );
 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);
 }
     wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
     return item->SetPos(pos);
 }


@@ -303,7 +314,7 @@ wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window)
 {
     wxGBSpan badspan(-1,-1);
     wxGBSizerItem* item = FindItem(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();
 }
 
     return item->GetSpan();
 }
 


@@ -312,7 +323,7 @@ wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer)
 {
     wxGBSpan badspan(-1,-1);
     wxGBSizerItem* item = FindItem(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();
 }
 
     return item->GetSpan();
 }
 


@@ -321,7 +332,7 @@ wxGBSpan wxGridBagSizer::GetItemSpan(size_t index)
 {
     wxGBSpan badspan(-1,-1);
     wxSizerItemList::compatibility_iterator node = m_children.Item( 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();
 }
     wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
     return item->GetSpan();
 }


@@ -347,7 +358,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 );
 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();
     return item->SetSpan(span);
 }


@@ -460,10 +471,10 @@ wxSize wxGridBagSizer::CalcMin()
             item->GetPos(row, col);
             item->GetEndPos(endrow, endcol);
 
             item->GetPos(row, col);
             item->GetEndPos(endrow, endcol);
 

-            // fill heights and widths upto this item if needed
-            while ( m_rowHeights.GetCount() <= (size_t)endrow )
+            // fill heights and widths up to this item if needed
+            while ( (int)m_rowHeights.GetCount() <= endrow )

                 m_rowHeights.Add(m_emptyCellSize.GetHeight());
                 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)
                 m_colWidths.Add(m_emptyCellSize.GetWidth());
 
             // See if this item increases the size of its row(s) or col(s)


@@ -571,7 +582,7 @@ void wxGridBagSizer::RecalcSizes()
 void wxGridBagSizer::AdjustForOverflow()
 {
     int row, col;
 void wxGridBagSizer::AdjustForOverflow()
 {
     int row, col;

-    
+

     for (row=0; row<(int)m_rowHeights.GetCount(); row++)
     {
         int rowExtra=INT_MAX;
     for (row=0; row<(int)m_rowHeights.GetCount(); row++)
     {
         int rowExtra=INT_MAX;


@@ -580,17 +591,17 @@ void wxGridBagSizer::AdjustForOverflow()
         {
             wxGBPosition pos(row,col);
             wxGBSizerItem* item = FindItemAtPosition(pos);
         {
             wxGBPosition pos(row,col);
             wxGBSizerItem* item = FindItemAtPosition(pos);

-            if ( !item )
+            if ( !item || !item->IsShown() )

                 continue;
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);
                 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 )
             {
             // 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;
             }
                 rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
                 continue;
             }


@@ -599,13 +610,13 @@ void wxGridBagSizer::AdjustForOverflow()
             if ( endrow == row )
             {
                 // first deduct the portions of the item that are on prior rows
             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;
                 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);
             }
                 // and check how much is left
                 rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
             }


@@ -623,28 +634,28 @@ void wxGridBagSizer::AdjustForOverflow()
         {
             wxGBPosition pos(row,col);
             wxGBSizerItem* item = FindItemAtPosition(pos);
         {
             wxGBPosition pos(row,col);
             wxGBSizerItem* item = FindItemAtPosition(pos);

-            if ( !item )
+            if ( !item || !item->IsShown() )

                 continue;
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);
                 continue;
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);

-            
+

             if ( item->GetPos() == pos && endcol == col )
             {
             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 )
             {
                 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;
                 for (int c=item->GetPos().GetCol(); c<col; c++)
                     itemWidth -= (m_colWidths[c] + GetVGap());
 
                 if ( itemWidth < 0 )
                     itemWidth = 0;

-                
+

                 colExtra = wxMin(colExtra, colWidth - itemWidth);
             }
         }
                 colExtra = wxMin(colExtra, colWidth - itemWidth);
             }
         }


@@ -652,7 +663,7 @@ void wxGridBagSizer::AdjustForOverflow()
             m_colWidths[col] -= colExtra;
     }
 
             m_colWidths[col] -= colExtra;
     }
 

-    
+

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -729,56 +740,56 @@ wxSizerItem* wxGridBagSizer::Add( int width, int height, int, int flag, int bord
 wxSizerItem* wxGridBagSizer::Add( wxSizerItem * )
 {
     wxFAIL_MSG(wxT("Invalid Add form called."));
 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."));
 }
 
 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."));
 }
 
 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."));
 }
 
 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."));
 }
 
 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."));
 }
 
 
 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."));
 }
 
 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."));
 }
 
 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."));
 }
 
 wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizerItem * )
 {
     wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));

-    return (wxSizerItem*)NULL;
+    return NULL;

 }
 
 
 }