Cleanly separate GUI socket-related code from net library.

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 8c4bec7bcc919a824aa74a11b43e7abb1a5a3f5d..8832ab7668187587eb724ab1ef171d79528bdddd 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,14 +40,18 @@ 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__)
+    #define wxHAS_NATIVE_IMAGELIST
+#endif

 
 

-#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
-    #include "wx/msw/imaglist.h"
-#elif defined(__WXMAC_CARBON__)
-    #include "wx/mac/imaglist.h"
-#else
+#if !defined(wxHAS_NATIVE_IMAGELIST)

     #include "wx/generic/imaglist.h"
     #include "wx/generic/imaglist.h"

+#elif defined(__WXMSW__)
+    #include "wx/msw/imaglist.h"
+#elif defined(__WXMAC__)
+    #include "wx/osx/imaglist.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/imaglist.h"

 #endif
 
 #endif
 

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