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

Fix assertion when passing nil to setKeyEquivalent.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-02-12 01:02:42 +00:00
parent f28b6f0668
commit 5ec8cc4ddd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,8 +242,10 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault ) void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
{ {
if ( [m_osxView isKindOfClass:[NSButton class]] ) if ( isDefault && [m_osxView isKindOfClass:[NSButton class]] )
[(NSButton*)m_osxView setKeyEquivalent: isDefault ? @"\r" : nil ]; // NOTE: setKeyEquivalent: nil will trigger an assert
// instead do not call in that case.
[(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
} }
void wxWidgetCocoaImpl::PerformClick() void wxWidgetCocoaImpl::PerformClick()