X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd6412b6d07c0291a8927375abaa7c0f815e4a96..4e2251ecd324ba89c486434485efcb1d32ee7dca:/include/wx/imaglist.h diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h index 8c4bec7bcc..9c76fdc2e6 100644 --- 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_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" -#else - #include "wx/generic/imaglist.h" #endif -#endif - // _WX_IMAGLIST_H_BASE_ +#endif // _WX_IMAGLIST_H_BASE_