Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / msw / imaglist.cpp

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index c80c8b8e7a423085fb68da10239e02df1916764e..89ff4b11ecf5604da1a62b6aba46a9c6689818ff 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -35,6 +35,7 @@
     #include "wx/icon.h"
     #include "wx/dc.h"
     #include "wx/string.h"
+    #include "wx/dcmemory.h"
 
     #include <stdio.h>
 #endif
@@ -231,13 +232,16 @@ bool wxImageList::Remove(int index)
 // Remove all images
 bool wxImageList::RemoveAll()
 {
-    bool ok = ImageList_RemoveAll(GetHImageList()) != 0;
-    if ( !ok )
+    // don't use ImageList_RemoveAll() because mingw32 headers don't have it
+    int count = ImageList_GetImageCount(GetHImageList());
+    for ( int i = 0; i < count; i++ )
     {
-        wxLogLastError("ImageList_RemoveAll()");
+        // the image indexes are shifted, so we should always remove the first
+        // one
+        (void)Remove(0);
     }
 
-    return ok;
+    return TRUE;
 }
 
 // Draws the given image on a dc at the specified position.