X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d3dfc57e77c64a4691fae47b566bcfb99eceb48..fdc255cfe0f2689f567a97a254967a47a0ac4482:/src/osx/artmac.cpp diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp index 04acf5caf4..267516cb7a 100644 --- a/src/osx/artmac.cpp +++ b/src/osx/artmac.cpp @@ -25,7 +25,7 @@ #include "wx/image.h" #endif -#if wxOSX_USE_COCOA_OR_CARBON +#include "wx/osx/private.h" // ---------------------------------------------------------------------------- // wxMacArtProvider @@ -34,8 +34,18 @@ class wxMacArtProvider : public wxArtProvider { protected: +#if wxOSX_USE_COCOA_OR_CARBON virtual wxIconBundle CreateIconBundle(const wxArtID& id, const wxArtClient& client); +#endif +#if wxOSX_USE_COCOA_OR_IPHONE + virtual wxBitmap CreateBitmap(const wxArtID& id, + const wxArtClient& client, + const wxSize& size) + { + return wxOSXCreateSystemBitmap(id, client, size); + } +#endif }; /* static */ void wxArtProvider::InitNativeProvider() @@ -43,6 +53,8 @@ protected: wxArtProvider::Push(new wxMacArtProvider); } +#if wxOSX_USE_COCOA_OR_CARBON + // ---------------------------------------------------------------------------- // helper macros // ---------------------------------------------------------------------------- @@ -103,6 +115,7 @@ wxIconBundle wxMacArtProvider::CreateIconBundle(const wxArtID& id, const wxArtCl return wxMacArtProvider_CreateIconBundle(id); } +#endif // ---------------------------------------------------------------------------- // wxArtProvider::GetNativeSizeHint() @@ -129,4 +142,3 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client) return wxDefaultSize; } -#endif // wxOSX_USE_COCOA_CARBON