renamed start parameter of wxDC::DrawPolyPolygon() to count (patch 882189)

[wxWidgets.git] / contrib / src / gizmos / multicell.cpp

diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
index 49ece0103f2be182c5ca237f52e97cc65d581cb3..d9bf7b136466c68959dc01298d5308773a0317dc 100644 (file)
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -186,7 +186,7 @@ wxMultiCellSizer::wxMultiCellSizer( int rows, int cols)
 //---------------------------------------------------------------------------
 wxMultiCellSizer::~wxMultiCellSizer()
 {
-       m_children.DeleteContents(TRUE);
+       WX_CLEAR_LIST(wxSizerItemList, m_children);
 
        free(m_maxHeight);
        free(m_maxWidth);
@@ -296,8 +296,8 @@ void wxMultiCellSizer::RecalcSizes()
        wxPoint c_point;
        wxSize  c_size;
 
-       wxSizerItemList::Node   *current = m_children.GetFirst();
-       while (current != NULL)
+       wxSizerItemList::compatibility_iterator         current = m_children.GetFirst();
+       while (current)
        {
                wxSizerItem     *item = current->GetData();
 
@@ -380,12 +380,9 @@ wxSize wxMultiCellSizer::CalcMin()
        if (m_children.GetCount() == 0)
                return wxSize(10,10);
 
-       int m_minWidth = 0;
-       int m_minHeight = 0;
-
        GetMinimums();
-       m_minWidth = Sum(m_maxWidth, m_cell_count.GetWidth());
-       m_minHeight = Sum(m_maxHeight, m_cell_count.GetHeight());
+       int m_minWidth = Sum(m_maxWidth, m_cell_count.GetWidth());
+       int m_minHeight = Sum(m_maxHeight, m_cell_count.GetHeight());
        return wxSize( m_minWidth, m_minHeight );
 }
 //---------------------------------------------------------------------------
@@ -403,7 +400,7 @@ void wxMultiCellSizer :: GetMinimums()
                m_weights[x]->SetWidth(0);
        }
 
-       wxSizerItemList::Node   *node = m_children.GetFirst();
+       wxSizerItemList::compatibility_iterator         node = m_children.GetFirst();
        while (node)
        {
                wxSizerItem     *item = node->GetData();