From 89552a02f5b404b61b945c64214b5684d258c767 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 3 Sep 2021 21:35:03 +0200
Subject: [PATCH] Remove unnecessary checks before calling GetNSImage()

Now that this function is guaranteed to return NULL if the bitmap is
invalid, the code can be simplified to rely on it.

No real changes.
---
 src/osx/cocoa/dataview.mm | 5 +----
 src/osx/cocoa/window.mm   | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 3b603a36e9..ac596c5114 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -3438,10 +3438,7 @@ bool wxDataViewIconTextRenderer::MacRender()
 
     cell = (wxImageTextCell*) GetNativeData()->GetItemCell();
     iconText << GetValue();
-    if (iconText.GetIcon().IsOk())
-        [cell setImage:wxBitmap(iconText.GetIcon()).GetNSImage()];
-    else
-        [cell setImage:nil];
+    [cell setImage:iconText.GetIcon().GetNSImage()];
     [cell setStringValue:wxCFStringRef(iconText.GetText()).AsNSString()];
     return true;
 }
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index de39ab8afe..8858d3aaee 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -3444,11 +3444,7 @@ void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
 {
     if (  [m_osxView respondsToSelector:@selector(setImage:)] )
     {
-        if (bitmap.IsOk())
-            [m_osxView setImage:bitmap.GetNSImage()];
-        else
-            [m_osxView setImage:nil];
-
+        [m_osxView setImage:bitmap.GetNSImage()];
         [m_osxView setNeedsDisplay:YES];
     }
 }