X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb45bb1fb231dd982d5196766dbca2ce161c0ea4..c5fc899bf29ca7d9c4e2a070e28228b430a68dd3:/src/cocoa/NSButton.mm

diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm
index c228460dd4..63cf30df2f 100644
--- a/src/cocoa/NSButton.mm
+++ b/src/cocoa/NSButton.mm
@@ -47,9 +47,9 @@ WX_IMPLEMENT_POSER(wxPoserNSButton);
 @implementation wxPoserNSButton :  NSButton
 - (void)wxNSButtonAction: (id)sender
 {
-    wxASSERT_MSG(self==sender,"Received wxNSButtonAction from another object");
+    wxASSERT_MSG((id)self==sender,wxT("Received wxNSButtonAction from another object"));
     wxCocoaNSButton *button = wxCocoaNSButton::GetFromCocoa(self);
-    wxCHECK_RET(button,"wxNSButtonAction received without associated wx object");
+    wxCHECK_RET(button,wxT("wxNSButtonAction received without associated wx object"));
     button->Cocoa_wxNSButtonAction();
 }
 
@@ -57,8 +57,11 @@ WX_IMPLEMENT_POSER(wxPoserNSButton);
 
 void wxCocoaNSButton::AssociateNSButton(WX_NSButton cocoaNSButton)
 {
-    sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this));
-    [cocoaNSButton setTarget: cocoaNSButton];
-    [cocoaNSButton setAction: @selector(wxNSButtonAction:)];
+    if(cocoaNSButton)
+    {
+        sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this));
+        [cocoaNSButton setTarget: cocoaNSButton];
+        [cocoaNSButton setAction: @selector(wxNSButtonAction:)];
+    }
 }