Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support SF Symbols images on macOS 11

Browse Source 
Extend wxOSXGetSystemImage() and thus wxArtProvider with support for directly
loading the new symbolic images in addition to existing support for named
bundle resources.

This enables usage such as wxArtProvider::GetBitmap("gearshape").
This commit is contained in:
Václav Slavík
2020-08-27 18:56:12 +02:00
parent ab29743097
commit acf02be808
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/carbon/utilscocoa.mm
View File

@@ -183,6 +183,16 @@ wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &client, c
WXImage wxOSXGetSystemImage(const wxString& name) WXImage wxOSXGetSystemImage(const wxString& name)
{ {
wxCFStringRef cfname(name); wxCFStringRef cfname(name);
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
if ( WX_IS_MACOS_AVAILABLE(11, 0) )
{
NSImage *symbol = [NSImage imageWithSystemSymbolName:cfname.AsNSString() accessibilityDescription:nil];
if ( symbol )
return symbol;
}
#endif
NSImage* nsimage = [NSImage imageNamed:cfname.AsNSString()]; NSImage* nsimage = [NSImage imageNamed:cfname.AsNSString()];
return nsimage; return nsimage;
} }