fixing warning and compile error against 10.4

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 9c76fdc2e645e375b2758a30f99f34d901184014..18b0daa5046726775d00a42a75094099ee24d8d3 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_CARBON__)
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPALMOS__)

     #define wxHAS_NATIVE_IMAGELIST
 #endif
 
     #define wxHAS_NATIVE_IMAGELIST
 #endif
 


@@ -48,8 +50,10 @@ enum
     #include "wx/generic/imaglist.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"
     #include "wx/generic/imaglist.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"

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

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