Use correct toolbar style for preferences on macOS 11
Code compiled against macOS 11 SDK must explicitly specify that the window should use preferences-style toolbar, otherwise the tabs would be moved to the right alongside window title, as is done with the standard toolbar now.
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include "wx/weakref.h"
|
||||
#include "wx/windowid.h"
|
||||
#include "wx/osx/private.h"
|
||||
#include "wx/osx/private/available.h"
|
||||
|
||||
#import <AppKit/NSWindow.h>
|
||||
|
||||
@@ -62,6 +63,13 @@ public:
|
||||
m_toolbarRealized(false),
|
||||
m_visiblePage(NULL)
|
||||
{
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
|
||||
if ( WX_IS_MACOS_AVAILABLE(11,0) )
|
||||
{
|
||||
NSWindow *win = GetWXWindow();
|
||||
[win setToolbarStyle:NSWindowToolbarStylePreference];
|
||||
}
|
||||
#endif
|
||||
m_toolbar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
|
||||
wxTB_FLAT | wxTB_TEXT);
|
||||
m_toolbar->SetToolBitmapSize(wxSize(32,32));
|
||||
|
Reference in New Issue
Block a user