test for valid icon

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

diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp
index 6e2c855c2043baa83a490204a5460d8477bb6d94..a640caffe703bfed86d9e2a86857f7df6c12bcc9 100644 (file)
--- a/src/mac/carbon/dataview.cpp
+++ b/src/mac/carbon/dataview.cpp
@@ -571,9 +571,14 @@ bool wxDataViewIconTextRenderer::Render(void)
 
    // variable definition:
     wxMacCFStringHolder cfString(iconText.GetText(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
 
    // variable definition:
     wxMacCFStringHolder cfString(iconText.GetText(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));

+
+    if (iconText.GetIcon().IsOk())
+    {
+       if (::SetDataBrowserItemDataIcon(this->GetDataReference(),MAC_WXHICON(iconText.GetIcon().GetHICON())) != noErr)
+          return false;
+    }

     
     

-    return ((::SetDataBrowserItemDataIcon(this->GetDataReference(),MAC_WXHICON(iconText.GetIcon().GetHICON())) == noErr) &&
-            (::SetDataBrowserItemDataText(this->GetDataReference(),cfString) == noErr));
+    return (::SetDataBrowserItemDataText(this->GetDataReference(),cfString) == noErr);

   } /* if */
   else
     return false;
   } /* if */
   else
     return false;