Make wxCocoa work with wxUSE_STL==1:

[wxWidgets.git] / src / os2 / gdiimage.cpp

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index a3ccae8a117a426d1d988d17a018750146f34c90..1c134658804378a8fbe37f1af246a694b4b6c3a0 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -33,6 +33,9 @@
 #include "wx/app.h"
 #include "wx/os2/gdiimage.h"
 
 #include "wx/app.h"
 #include "wx/os2/gdiimage.h"
 

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGDIImageHandlerList);
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -224,17 +227,11 @@ private:
     IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
 #endif
 
     IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
 #endif
 

-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static wxSize GetHiconSize(WXHICON hicon);
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-wxList wxGDIImage::ms_handlers;
+wxGDIImageHandlerList wxGDIImage::ms_handlers;

 
 // ----------------------------------------------------------------------------
 // wxGDIImage functions forwarded to wxGDIImageRefData
 
 // ----------------------------------------------------------------------------
 // wxGDIImage functions forwarded to wxGDIImageRefData


@@ -295,17 +292,17 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
   const wxString&                   rName
 )
 {
   const wxString&                   rName
 )
 {

-    wxNode*                         pNode = ms_handlers.First();
+    wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();

 
 

-    while (pNode)
+    while ( pNode )

     {
     {

-        wxGDIImageHandler*          pHandler = (wxGDIImageHandler *)pNode->Data();
+        wxGDIImageHandler*          pHandler = pNode->GetData();

 
 

-        if (pHandler->GetName() == rName)
-            return(pHandler);
-        pNode = pNode->Next();
+        if ( pHandler->GetName() == rName )
+            return pHandler;
+        pNode = pNode->GetNext();

     }
     }

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

 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(


@@ -313,52 +310,49 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
 , long                              lType
 )
 {
 , long                              lType
 )
 {

-    wxNode*                         pNode = ms_handlers.First();
-
-    while (pNode)
+    wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();
+    while ( pNode )

     {
     {

-        wxGDIImageHandler*          pHandler = (wxGDIImageHandler *)pNode->Data();
+        wxGDIImageHandler*          pHandler = pNode->GetData();

 
 

-        if ((pHandler->GetExtension() = rExtension) &&
-            (lType == -1 || pHandler->GetType() == lType))
+        if ( (pHandler->GetExtension() = rExtension) &&
+             (lType == -1 || pHandler->GetType() == lType) )

         {
         {

-            return(pHandler);
+            return pHandler;

         }
         }

-        pNode = pNode->Next();
+        pNode = pNode->GetNext();

     }
     }

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

 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
   long                              lType
 )
 {
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
   long                              lType
 )
 {

-    wxNode*                         pNode = ms_handlers.First();
+    wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();

 
 

-    while (pNode)
+    while ( pNode )

     {
     {

-        wxGDIImageHandler*          pHandler = (wxGDIImageHandler *)pNode->Data();
+        wxGDIImageHandler*          pHandler = pNode->GetData();

 
 

-        if (pHandler->GetType() == lType)
+        if ( pHandler->GetType() == lType )

             return pHandler;
             return pHandler;

-        pNode = pNode->Next();
+        pNode = pNode->GetNext();

     }
     }

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

 }
 
 void wxGDIImage::CleanUpHandlers()
 {
 }
 
 void wxGDIImage::CleanUpHandlers()
 {

-    wxNode*                         pNode = ms_handlers.First();
+    wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();

 
 

-    while (pNode)
+    while ( pNode )

     {
     {

-        wxGDIImageHandler*          pHandler = (wxGDIImageHandler *)pNode->Data();
-        wxNode*                     pNext    = pNode->Next();
+        wxGDIImageHandler*                              pHandler = pNode->GetData();
+        wxGDIImageHandlerList::compatibility_iterator   pNext = pNode->GetNext();

 
         delete pHandler;
 
         delete pHandler;

-#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))
-        delete pNode;
-#endif
+        ms_handlers.Erase( pNode );

         pNode = pNext;
     }
 }
         pNode = pNext;
     }
 }


@@ -511,17 +505,3 @@ bool wxICOResourceHandler::LoadIcon(
     return pIcon->Ok();
 } // end of wxICOResourceHandler::LoadIcon
 
     return pIcon->Ok();
 } // end of wxICOResourceHandler::LoadIcon
 

-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static wxSize GetHiconSize(
-  WXHICON                           hicon
-)
-{
-    wxSize                          vSize(32, 32);    // default
-
-    // all OS/2 icons are 32x32
-    return(vSize);
-}
-