wxchar.h doesn't have to be C file anymore, it's C++

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 70e0ee492ef69e6c7f8bfd5387d5dfe7e1814814..72eb445d73d312dd5c2ca4496992b8d9d4da6fad 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -14,30 +14,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_IMAGLIST
+#if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST)

 
 #ifndef __WXPALMOS__
 
 
 #ifndef __WXPALMOS__
 

-#include "wx/generic/imaglist.h"
+#include "wx/imaglist.h"

 
 

-#include "wx/icon.h"
-#include "wx/image.h"
-#include "wx/dc.h"
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif

 
 //-----------------------------------------------------------------------------
 //  wxImageList
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
 
 //-----------------------------------------------------------------------------
 //  wxImageList
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)

-
-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
-/*
- * wxImageList has to be a real class or we have problems with
- * the run-time information.
- */
-

 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)

-#endif

 
 wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
 {
 
 wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
 {


@@ -217,7 +211,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }

-    
+

     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 
     if (mask.Ok())
         newBitmap->SetMask(new wxMask(mask));
 


@@ -277,5 +271,6 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
     return true;
 }
 
     return true;
 }
 

-#endif // wxUSE_IMAGLIST

 #endif // __WXPALMOS__
 #endif // __WXPALMOS__

+
+#endif // wxUSE_IMAGLIST