From: Kevin Ollivier <kevino@theolliviers.com>
Date: Thu, 12 Feb 2009 01:02:42 +0000 (+0000)
Subject: Fix assertion when passing nil to setKeyEquivalent.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5ec8cc4dddc12407fb70be36674154fc17eb4a3e

Fix assertion when passing nil to setKeyEquivalent.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 7df36925de..fb57055cd5 100644
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -242,8 +242,10 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
 { 
-    if ( [m_osxView isKindOfClass:[NSButton class]] )
-        [(NSButton*)m_osxView setKeyEquivalent: isDefault ? @"\r" : nil ];
+    if ( isDefault && [m_osxView isKindOfClass:[NSButton class]] )
+        // NOTE: setKeyEquivalent: nil will trigger an assert
+        // instead do not call in that case.
+        [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
 }
 
 void wxWidgetCocoaImpl::PerformClick()