Updated depricated stuff

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

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index 24c76a3dabbb030449499afb52b007b173fbd16b..0b356d003ab1546c278d04f4788346c81d92d7c8 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -298,17 +298,15 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
   const wxString&                   rName
 )
 {
-    wxNode*                         pNode = ms_handlers.First();
-
-    while (pNode)
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
+    while ( node )
     {
-        wxGDIImageHandler*          pHandler = (wxGDIImageHandler *)pNode->Data();
-
-        if (pHandler->GetName() == rName)
-            return(pHandler);
-        pNode = pNode->Next();
+        wxGDIImageHandler *handler = node->GetData();
+        if ( handler->GetName() == name )
+            return handler;
+        node = node->GetNext();
     }
-    return(NULL);
+    return((wxGDIImageHandler*)NULL);
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
@@ -316,20 +314,19 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
 , long                              lType
 )
 {
-    wxNode*                         pNode = ms_handlers.First();
-
-    while (pNode)
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
+    while ( node )
     {
-        wxGDIImageHandler*          pHandler = (wxGDIImageHandler *)pNode->Data();
-
-        if ((pHandler->GetExtension() = rExtension) &&
-            (lType == -1 || pHandler->GetType() == lType))
+        wxGDIImageHandler *handler = node->GetData();
+        if ( (handler->GetExtension() = extension) &&
+             (type == -1 || handler->GetType() == type) )
         {
-            return(pHandler);
+            return handler;
         }
-        pNode = pNode->Next();
+
+        node = node->GetNext();
     }
-    return(NULL);
+    return((wxGDIImageHandler*)NULL);
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(