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

Fix check toolbar items behaviour in non-native toolbars in wxOSX.

Browse Source 
Update the button state when the tool is toggled. Also use NSToggleButton for
this tool and not NSOnOffButton as the latter doesn't use the alternative
(toggled) image.

Closes #12408.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-11-05 21:43:28 +00:00
parent c71096a055
commit 5e9897b4be
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,7 +537,11 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
else
[m_toolbarItem setImage:m_bmpNormal.GetNSImage()];
}
else
#endif
{
[(NSButton*)m_controlHandle setState:(toggle ? NSOnState : NSOffState)];
}
}
wxToolBarTool::wxToolBarTool(
@@ -1268,7 +1272,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
[v setBezelStyle:NSRegularSquareBezelStyle];
[v setBordered:NO];
[v setButtonType: ( tool->CanBeToggled() ? NSOnOffButton : NSMomentaryPushInButton )];
[v setButtonType: ( tool->CanBeToggled() ? NSToggleButton : NSMomentaryPushInButton )];
[v setImplementation:tool];
controlHandle = v;