update mac gl, after rev 50900

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 8c4bec7bcc919a824aa74a11b43e7abb1a5a3f5d..f4468e216f9ca75abd133df219c19f4306059fbd 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -27,7 +27,8 @@
  */
 
 // 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)
@@ -39,14 +40,16 @@ enum {
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
+#if defined(__WXMSW__) || defined(__WXMAC__)
+    #define wxHAS_NATIVE_IMAGELIST
+#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__)
+#elif defined(__WXMAC__)
     #include "wx/mac/imaglist.h"
-#else
-    #include "wx/generic/imaglist.h"
 #endif
 
-#endif
-    // _WX_IMAGLIST_H_BASE_
+#endif // _WX_IMAGLIST_H_BASE_