X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3c861501a451503b31c075ccb59d16b0ae01e99..44bcee116e0c56abe8027afcb1a3575fdc6ff732:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index 34993fdb40..23ece7720e 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -32,12 +32,26 @@ #elif defined(__WXDFB__) #include "wx/generic/icon.h" #elif defined(__WXMAC__) - #include "wx/mac/icon.h" +#if wxOSX_USE_CARBON + #include "wx/osx/icon.h" +#else + #include "wx/generic/icon.h" +#endif #elif defined(__WXCOCOA__) #include "wx/cocoa/icon.h" #elif defined(__WXPM__) #include "wx/os2/icon.h" #endif +//----------------------------------------------------------------------------- +// wxVariant support +//----------------------------------------------------------------------------- + +#if wxUSE_VARIANT +#include "wx/variant.h" +DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE) +#endif + + #endif // _WX_ICON_H_BASE_