Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / imaglist.h

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 2779e3f1e598daa23351c68219cff19989677915..c9f07299f08a744944a912a1dda24c34bc7252a1 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -12,6 +12,8 @@
 #ifndef _WX_IMAGLIST_H_BASE_
 #define _WX_IMAGLIST_H_BASE_
 
 #ifndef _WX_IMAGLIST_H_BASE_
 #define _WX_IMAGLIST_H_BASE_
 

+#include "wx/defs.h"
+

 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
  * images for their items by an index into an image list.
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
  * images for their items by an index into an image list.


@@ -40,7 +42,7 @@ 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(__WXMAC__) || defined(__WXPALMOS__)
+#if defined(__WXMSW__) || defined(__WXMAC__)

     #define wxHAS_NATIVE_IMAGELIST
 #endif
 
     #define wxHAS_NATIVE_IMAGELIST
 #endif
 


@@ -49,9 +51,7 @@ enum
 #elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/imaglist.h"
-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/imaglist.h"
+    #include "wx/osx/imaglist.h"

 #endif
 
 #endif // _WX_IMAGLIST_H_BASE_
 #endif
 
 #endif // _WX_IMAGLIST_H_BASE_