X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a3e173a02857f1f2e166e068331d1a42b85f391..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/imaglist.h diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h index 2e928484fa..c9f07299f0 100644 --- a/include/wx/imaglist.h +++ b/include/wx/imaglist.h @@ -12,6 +12,8 @@ #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. @@ -27,7 +29,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 +42,16 @@ enum { #define wxIMAGELIST_DRAW_SELECTED 0x0004 #define wxIMAGELIST_DRAW_FOCUSED 0x0008 -#include "wx/generic/imaglist.h" +#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__) - #include "wx/mac/imaglist.h" +#elif defined(__WXMAC__) + #include "wx/osx/imaglist.h" #endif -#endif - // _WX_IMAGLIST_H_BASE_ +#endif // _WX_IMAGLIST_H_BASE_