STL fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/animate/animate.cpp b/contrib/src/animate/animate.cpp
index a0fd35de33bd8098b5e200a1dae1c9437fc643ac..2bca70edb856075c2cb96934133ecc83f630b097 100644 (file)
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -292,13 +292,13 @@ bool wxAnimationPlayer::PlayFrame()
 // Clear the wxImage cache
 void wxAnimationPlayer::ClearCache()
 {
 // Clear the wxImage cache
 void wxAnimationPlayer::ClearCache()
 {

-    wxNode* node = m_frames.GetFirst();
+    wxList::compatibility_iterator node = m_frames.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxNode* next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();

         wxBitmap* bitmap = (wxBitmap*) node->GetData();
         delete bitmap;
         wxBitmap* bitmap = (wxBitmap*) node->GetData();
         delete bitmap;

-        delete node;
+        m_frames.Erase(node);

         node = next;
     }
 }
         node = next;
     }
 }


@@ -369,7 +369,7 @@ void wxAnimationPlayer::DrawFrame(int frame, wxDC& dc, const wxPoint& pos)
 {
     wxASSERT_MSG( (m_animation != NULL), _T("Animation not present in wxAnimationPlayer"));
     wxASSERT_MSG( (m_frames.GetCount() != 0), _T("Animation cache not present in wxAnimationPlayer"));
 {
     wxASSERT_MSG( (m_animation != NULL), _T("Animation not present in wxAnimationPlayer"));
     wxASSERT_MSG( (m_frames.GetCount() != 0), _T("Animation cache not present in wxAnimationPlayer"));

-    wxASSERT_MSG( (m_frames.Item(frame) != (wxNode*) NULL), _T("Image not present in wxAnimationPlayer::DrawFrame"));
+    wxASSERT_MSG( !!m_frames.Item(frame), _T("Image not present in wxAnimationPlayer::DrawFrame"));

 
     wxBitmap* bitmap = (wxBitmap*) m_frames.Item(frame)->GetData() ;
 
 
     wxBitmap* bitmap = (wxBitmap*) m_frames.Item(frame)->GetData() ;
 

diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
index d50fd58826ad425883825915e4a1a483b092eb03..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()
 {
 //---------------------------------------------------------------------------
 wxMultiCellSizer::~wxMultiCellSizer()
 {

-       m_children.DeleteContents(TRUE);
+       WX_CLEAR_LIST(wxSizerItemList, m_children);

 
        free(m_maxHeight);
        free(m_maxWidth);
 
        free(m_maxHeight);
        free(m_maxWidth);


@@ -296,8 +296,8 @@ void wxMultiCellSizer::RecalcSizes()
        wxPoint c_point;
        wxSize  c_size;
 
        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();
 
        {
                wxSizerItem     *item = current->GetData();
 


@@ -400,7 +400,7 @@ void wxMultiCellSizer :: GetMinimums()
                m_weights[x]->SetWidth(0);
        }
 
                m_weights[x]->SetWidth(0);
        }
 

-       wxSizerItemList::Node   *node = m_children.GetFirst();
+       wxSizerItemList::compatibility_iterator         node = m_children.GetFirst();

        while (node)
        {
                wxSizerItem     *item = node->GetData();
        while (node)
        {
                wxSizerItem     *item = node->GetData();

diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index df95c09d8c087c4d5410a831a788495c7150de5c..3927f0aa7c6078317869677bdba28b4598578a1d 100644 (file)
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -717,7 +717,7 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
     }
 
     // Find targets in splitter window and send the event to them
     }
 
     // Find targets in splitter window and send the event to them

-    wxWindowListNode* node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while (node)
     {
         wxWindow* child = (wxWindow*) node->GetData();
     while (node)
     {
         wxWindow* child = (wxWindow*) node->GetData();

diff --git a/contrib/src/plot/plot.cpp b/contrib/src/plot/plot.cpp
index cfb39ec51917b915dbbc142e372302a87f009458..0497b812bfd2d3d80837adf3fa0c1a4276ed05bc 100644 (file)
--- a/contrib/src/plot/plot.cpp
+++ b/contrib/src/plot/plot.cpp
@@ -229,7 +229,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
     x += view_x;
     y += view_y;
     
     x += view_x;
     y += view_y;
     

-    wxNode *node = m_owner->m_curves.GetFirst();
+    wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();

     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*)node->GetData();
     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*)node->GetData();


@@ -413,7 +413,7 @@ void wxPlotArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
 */
         
         }
 */
         

-        wxNode *node = m_owner->m_curves.GetFirst();
+        wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();

         while (node)
         {
             wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
         while (node)
         {
             wxPlotCurve *curve = (wxPlotCurve*) node->GetData();


@@ -810,7 +810,7 @@ size_t wxPlotWindow::GetCount()
 
 wxPlotCurve *wxPlotWindow::GetAt( size_t n )
 {
 
 wxPlotCurve *wxPlotWindow::GetAt( size_t n )
 {

-    wxNode *node = m_curves.Item( n );
+    wxList::compatibility_iterator node = m_curves.Item( n );

     if (!node)
         return (wxPlotCurve*) NULL;
         
     if (!node)
         return (wxPlotCurve*) NULL;
         


@@ -833,7 +833,7 @@ void wxPlotWindow::SetCurrent( wxPlotCurve* current )
 
 void wxPlotWindow::Delete( wxPlotCurve* curve )
 {
 
 void wxPlotWindow::Delete( wxPlotCurve* curve )
 {

-    wxNode *node = m_curves.Find( curve );
+    wxList::compatibility_iterator node = m_curves.Find( curve );

     if (!node) return;
     
     m_curves.DeleteObject( curve );
     if (!node) return;
     
     m_curves.DeleteObject( curve );


@@ -856,7 +856,7 @@ void wxPlotWindow::Add( wxPlotOnOffCurve *curve )
 
 void wxPlotWindow::Delete( wxPlotOnOffCurve* curve )
 {
 
 void wxPlotWindow::Delete( wxPlotOnOffCurve* curve )
 {

-    wxNode *node = m_onOffCurves.Find( curve );
+    wxList::compatibility_iterator node = m_onOffCurves.Find( curve );

     if (!node) return;
     
     m_onOffCurves.DeleteObject( curve );
     if (!node) return;
     
     m_onOffCurves.DeleteObject( curve );


@@ -869,7 +869,7 @@ size_t wxPlotWindow::GetOnOffCurveCount()
 
 wxPlotOnOffCurve *wxPlotWindow::GetOnOffCurveAt( size_t n )
 {
 
 wxPlotOnOffCurve *wxPlotWindow::GetOnOffCurveAt( size_t n )
 {

-    wxNode *node = m_onOffCurves.Item( n );
+    wxList::compatibility_iterator node = m_onOffCurves.Item( n );

     if (!node)
         return (wxPlotOnOffCurve*) NULL;
         
     if (!node)
         return (wxPlotOnOffCurve*) NULL;
         


@@ -950,7 +950,7 @@ void wxPlotWindow::SetZoom( double zoom )
     GetViewStart( &view_x, &view_y );
     
     wxInt32 max = 0;
     GetViewStart( &view_x, &view_y );
     
     wxInt32 max = 0;

-    wxNode *node = m_curves.GetFirst();
+    wxList::compatibility_iterator node = m_curves.GetFirst();

     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();


@@ -970,7 +970,7 @@ void wxPlotWindow::SetZoom( double zoom )
 void wxPlotWindow::ResetScrollbar()
 {
     wxInt32 max = 0;
 void wxPlotWindow::ResetScrollbar()
 {
     wxInt32 max = 0;

-    wxNode *node = m_curves.GetFirst();
+    wxList::compatibility_iterator node = m_curves.GetFirst();

     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();