use native wxImageList for wxUniv, it's a low level class and so it doesn't make...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ac83ee14367922e31202614e82fd989e59cbbc9d..646f247b576f9eebc2ab3b93a2acbff88a8e4faa 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1463,6 +1463,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/gdiobj.cpp
     src/msw/gsockmsw.cpp
     src/msw/icon.cpp
     src/msw/gdiobj.cpp
     src/msw/gsockmsw.cpp
     src/msw/icon.cpp

+    src/msw/imaglist.cpp

     src/msw/minifram.cpp
     src/msw/ole/dataobj.cpp
     src/msw/ole/dropsrc.cpp
     src/msw/minifram.cpp
     src/msw/ole/dataobj.cpp
     src/msw/ole/dropsrc.cpp


@@ -1520,7 +1521,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge95.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge95.cpp

-    src/msw/imaglist.cpp

     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp
     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 7a2747e594754e04fbd8729ce013c1520640c692..9c76fdc2e645e375b2758a30f99f34d901184014 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -27,7 +27,8 @@
  */
 
 // Flag values for Set/GetImageList
  */
 
 // Flag values for Set/GetImageList

-enum {
+enum
+{

     wxIMAGE_LIST_NORMAL, // Normal icons
     wxIMAGE_LIST_SMALL,  // Small icons
     wxIMAGE_LIST_STATE   // State icons: unimplemented (see WIN32 documentation)
     wxIMAGE_LIST_NORMAL, // Normal icons
     wxIMAGE_LIST_SMALL,  // Small icons
     wxIMAGE_LIST_STATE   // State icons: unimplemented (see WIN32 documentation)


@@ -39,15 +40,16 @@ enum {
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 

-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
-    #include "wx/generic/imaglist.h"
+#if defined(__WXMSW__) || defined(__WXMAC_CARBON__)
+    #define wxHAS_NATIVE_IMAGELIST

 #endif
 
 #endif
 

-#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+#if !defined(wxHAS_NATIVE_IMAGELIST)
+    #include "wx/generic/imaglist.h"
+#elif defined(__WXMSW__)

     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC_CARBON__)
     #include "wx/mac/imaglist.h"
 #endif
 
     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC_CARBON__)
     #include "wx/mac/imaglist.h"
 #endif
 

-#endif
-    // _WX_IMAGLIST_H_BASE_
+#endif // _WX_IMAGLIST_H_BASE_

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

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

 
 #ifndef __WXPALMOS__
 
 
 #ifndef __WXPALMOS__
 


@@ -31,15 +31,7 @@
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)

-
-#if !HAVE_NATIVE_IMAGELIST
-/*
- * 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 )
 {