turning on icons for osx-cocoa

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 7bca512e8d0731b28084ac95bbf17847dc888d36..2ece3c33b2e7f7c67b28b3bf877f7bbeb160d392 100644 (file)
--- 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 37a2f3e2027a5cbd9705c355ef8ca70b78c8b113..92e7cbee4e516253350ef9bd852a05e9a6f526d3 100644 (file)
--- 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