Return optimal label width from DrawHeaderButton

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 2e928484fa2028d44131e8e6852406462172a897..9c76fdc2e645e375b2758a30f99f34d901184014 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,13 +40,16 @@ enum {
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
-#include "wx/generic/imaglist.h"
+#if defined(__WXMSW__) || defined(__WXMAC_CARBON__)
+    #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__)
     #include "wx/mac/imaglist.h"
 #endif
 
-#endif
-    // _WX_IMAGLIST_H_BASE_
+#endif // _WX_IMAGLIST_H_BASE_