Crash fix for when a wxNullBitmap is passed in as the bitmap to use.

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

diff --git a/src/osx/cocoa/bmpbuttn.mm b/src/osx/cocoa/bmpbuttn.mm
index fd5f716ff8a2361dc59e78e44512b9109cf3e625..f6fbea347648606ad869c69ef3348cd806d5749f 100644 (file)
--- a/src/osx/cocoa/bmpbuttn.mm
+++ b/src/osx/cocoa/bmpbuttn.mm
@@ -47,7 +47,9 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
             [v setBezelStyle:NSRegularSquareBezelStyle];
     }
     
             [v setBezelStyle:NSRegularSquareBezelStyle];
     }
     

-    [v setImage:bitmap.GetNSImage() ];
+    if (bitmap.Ok())
+        [v setImage:bitmap.GetNSImage() ];
+    

     [v setButtonType:NSMomentaryPushInButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
     [v setButtonType:NSMomentaryPushInButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;