add support for hiding columns when using native header control in wxGrid; also added...

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 2cc89ab085d97c43382166dc0ec02585af0b7fd1..72eb445d73d312dd5c2ca4496992b8d9d4da6fad 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -14,33 +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"

 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"

+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/image.h"
-

 //-----------------------------------------------------------------------------
 //  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 )
 {