turning on icons for osx-cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -228,7 +228,7 @@ private:
|
|||||||
|
|
||||||
#if !defined(__WXUNIVERSAL__) && \
|
#if !defined(__WXUNIVERSAL__) && \
|
||||||
((defined(__WXGTK__) && defined(__WXGTK20__)) || defined(__WXMSW__) || \
|
((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
|
// *some* (partial) native implementation of wxArtProvider exists; this is
|
||||||
// not the same as wxArtProvider::HasNativeProvider()!
|
// not the same as wxArtProvider::HasNativeProvider()!
|
||||||
#define wxHAS_NATIVE_ART_PROVIDER_IMPL
|
#define wxHAS_NATIVE_ART_PROVIDER_IMPL
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
#include "wx/image.h"
|
#include "wx/image.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxOSX_USE_CARBON
|
#if wxOSX_USE_COCOA_OR_CARBON
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxMacArtProvider
|
// wxMacArtProvider
|
||||||
@@ -126,4 +126,4 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
|
|||||||
return wxDefaultSize;
|
return wxDefaultSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // wxOSX_USE_CARBON
|
#endif // wxOSX_USE_COCOA_CARBON
|
||||||
|
Reference in New Issue
Block a user