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

avoiding NSToolbarSeparatorItemIdentifier under Lion, where it is not supported anymore, fixes #13363

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-12-06 18:35:49 +00:00
parent 83c6ae8e25
commit f825123271
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osx/cocoa/toolbar.mm
View File

@@ -1100,8 +1100,15 @@ bool wxToolBar::Realize()
NSString *nsItemId; NSString *nsItemId;
if (tool->GetStyle() == wxTOOL_STYLE_SEPARATOR) if (tool->GetStyle() == wxTOOL_STYLE_SEPARATOR)
{ {
nsItemId = tool->IsStretchable() ? NSToolbarFlexibleSpaceItemIdentifier if ( tool->IsStretchable() )
: NSToolbarSeparatorItemIdentifier; nsItemId = NSToolbarFlexibleSpaceItemIdentifier;
else
{
if ( UMAGetSystemVersion() < 0x1070 )
nsItemId = NSToolbarSeparatorItemIdentifier;
else
nsItemId = NSToolbarSpaceItemIdentifier;
}
} }
else else
{ {
@@ -1350,8 +1357,18 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
#if wxOSX_USE_NATIVE_TOOLBAR #if wxOSX_USE_NATIVE_TOOLBAR
if (m_macToolbar != NULL) if (m_macToolbar != NULL)
{ {
NSString * nsItemId = tool->IsStretchable() ? NSToolbarFlexibleSpaceItemIdentifier NSString * nsItemId = nil;
: NSToolbarSeparatorItemIdentifier;
if ( tool->IsStretchable() )
nsItemId = NSToolbarFlexibleSpaceItemIdentifier;
else
{
if ( UMAGetSystemVersion() < 0x1070 )
nsItemId = NSToolbarSeparatorItemIdentifier;
else
nsItemId = NSToolbarSpaceItemIdentifier;
}
NSToolbarItem* item = [[NSToolbarItem alloc] initWithItemIdentifier:nsItemId]; NSToolbarItem* item = [[NSToolbarItem alloc] initWithItemIdentifier:nsItemId];
tool->SetToolbarItemRef( item ); tool->SetToolbarItemRef( item );
} }