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

carry changes to toolbar over to prefs on osx

Browse Source
This commit is contained in:
Stefan Csomor
2021-09-28 10:17:09 +02:00
committed by Vadim Zeitlin
parent edc95443a3
commit 388d322b68
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/preferences.h
View File

@@ -15,6 +15,7 @@
#if wxUSE_PREFERENCES_EDITOR #if wxUSE_PREFERENCES_EDITOR
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/bmpbndl.h"
#include "wx/vector.h" #include "wx/vector.h"
class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxWindow;

14
src/osx/cocoa/preferences.mm
View File

@@ -32,6 +32,7 @@
#include "wx/weakref.h" #include "wx/weakref.h"
#include "wx/windowid.h" #include "wx/windowid.h"
#include "wx/osx/private.h" #include "wx/osx/private.h"
#include "wx/private/bmpbndl.h"
#include "wx/osx/private/available.h" #include "wx/osx/private/available.h"
#import <AppKit/NSWindow.h> #import <AppKit/NSWindow.h>
@@ -39,15 +40,16 @@
wxBitmap wxStockPreferencesPage::GetLargeIcon() const wxBitmap wxStockPreferencesPage::GetLargeIcon() const
{ {
wxBitmapBundle bundle;
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
if ( WX_IS_MACOS_AVAILABLE(11, 0) ) if ( WX_IS_MACOS_AVAILABLE(11, 0) )
{ {
switch ( m_kind ) switch ( m_kind )
{ {
case Kind_General: case Kind_General:
return wxBitmap([NSImage imageWithSystemSymbolName:@"gearshape" accessibilityDescription:nil]); bundle = wxOSXMakeBundleFromImage([NSImage imageWithSystemSymbolName:@"gearshape" accessibilityDescription:nil]);
case Kind_Advanced: case Kind_Advanced:
return wxBitmap([NSImage imageWithSystemSymbolName:@"gearshape.2" accessibilityDescription:nil]); bundle = wxOSXMakeBundleFromImage([NSImage imageWithSystemSymbolName:@"gearshape.2" accessibilityDescription:nil]);
} }
} }
#endif #endif
@@ -55,12 +57,12 @@ wxBitmap wxStockPreferencesPage::GetLargeIcon() const
switch ( m_kind ) switch ( m_kind )
{ {
case Kind_General: case Kind_General:
return wxBitmap([NSImage imageNamed:NSImageNamePreferencesGeneral]); bundle = wxOSXMakeBundleFromImage([NSImage imageNamed:NSImageNamePreferencesGeneral]);
case Kind_Advanced: case Kind_Advanced:
return wxBitmap([NSImage imageNamed:NSImageNameAdvanced]); bundle = wxOSXMakeBundleFromImage([NSImage imageNamed:NSImageNameAdvanced]);
} }
return wxBitmap(); // silence compiler warning return bundle.IsOk() ? bundle.GetBitmap(bundle.GetDefaultSize()) : wxNullBitmap;
} }
@@ -98,7 +100,7 @@ public:
"can't add more preferences pages after showing the window" ); "can't add more preferences pages after showing the window" );
const wxString title = page->GetName(); const wxString title = page->GetName();
wxBitmap bmp(page->GetLargeIcon()); wxBitmapBundle bmp(page->GetLargeIcon());
wxASSERT_MSG( bmp.IsOk(), "OS X requires valid bitmap for preference page" ); wxASSERT_MSG( bmp.IsOk(), "OS X requires valid bitmap for preference page" );
int toolId = wxIdManager::ReserveId(); int toolId = wxIdManager::ReserveId();