Guard against comparing invalid iterators, which produces an assertion

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 70e0ee492ef69e6c7f8bfd5387d5dfe7e1814814..2cc89ab085d97c43382166dc0ec02585af0b7fd1 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -20,9 +20,12 @@
 
 #include "wx/generic/imaglist.h"
 
-#include "wx/icon.h"
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/icon.h"
+#endif
+
 #include "wx/image.h"
-#include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 //  wxImageList
@@ -217,7 +220,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }
-    
+
     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 
@@ -277,5 +280,6 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
     return true;
 }
 
-#endif // wxUSE_IMAGLIST
 #endif // __WXPALMOS__
+
+#endif // wxUSE_IMAGLIST