X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/118cc185eb27b933439f3fb136b2b6ece5fe1bea..dc3b0532ee434e7344cc939526c982918bfd3d4f:/contrib/src/gizmos/multicell.cpp diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp index 632c054674..a7a9020b38 100644 --- a/contrib/src/gizmos/multicell.cpp +++ b/contrib/src/gizmos/multicell.cpp @@ -296,11 +296,10 @@ void wxMultiCellSizer::RecalcSizes() wxPoint c_point; wxSize c_size; - wxNode *current; - current = m_children.GetFirst(); + wxSizerItemList::Node *current = m_children.GetFirst(); while (current != NULL) { - wxSizerItem *item = (wxSizerItem*) current->Data(); + wxSizerItem *item = current->GetData(); wxMultiCellItemHandle *rect; if (item != NULL && @@ -372,7 +371,7 @@ void wxMultiCellSizer::RecalcSizes() } item->SetDimension(c_point, c_size); } - current = current->Next(); + current = current->GetNext(); } } //--------------------------------------------------------------------------- @@ -404,10 +403,10 @@ void wxMultiCellSizer :: GetMinimums() m_weights[x]->SetWidth(0); } - wxNode *node = m_children.GetFirst(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxSizerItem *item = node->GetData(); wxMultiCellItemHandle *rect; if (item != NULL && (rect = (wxMultiCellItemHandle *)item->GetUserData()) != NULL) @@ -506,7 +505,7 @@ void wxMultiCellSizer :: GetMinimums() m_maxWidth[col] = wxMax(m_maxWidth[col], m_defaultCellSize.GetWidth()); m_weights[col]->SetWidth(wxMax(m_weights[col]->GetWidth(), rect->GetWeight().GetWidth())); } - node = node->Next(); + node = node->GetNext(); } } } // wxMultiCellSizer :: GetMinimums