From 1d61c554320c662fe55dadc47693bc07516e086f Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 8 Feb 2009 18:24:07 +0000 Subject: [PATCH] turning on icons for osx-cocoa git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/artprov.h | 2 +- src/osx/artmac.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 7bca512e8d..2ece3c33b2 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -228,7 +228,7 @@ private: #if !defined(__WXUNIVERSAL__) && \ ((defined(__WXGTK__) && defined(__WXGTK20__)) || defined(__WXMSW__) || \ - (defined(__WXMAC__) && wxOSX_USE_CARBON)) + (defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)) // *some* (partial) native implementation of wxArtProvider exists; this is // not the same as wxArtProvider::HasNativeProvider()! #define wxHAS_NATIVE_ART_PROVIDER_IMPL diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp index 37a2f3e202..92e7cbee4e 100644 --- a/src/osx/artmac.cpp +++ b/src/osx/artmac.cpp @@ -25,7 +25,7 @@ #include "wx/image.h" #endif -#if wxOSX_USE_CARBON +#if wxOSX_USE_COCOA_OR_CARBON // ---------------------------------------------------------------------------- // wxMacArtProvider @@ -126,4 +126,4 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client) return wxDefaultSize; } -#endif // wxOSX_USE_CARBON +#endif // wxOSX_USE_COCOA_CARBON -- 2.47.2