From: Václav Slavík <vslavik@fastmail.fm>
Date: Fri, 31 Oct 2008 10:06:19 +0000 (+0000)
Subject: wxTLW: don't assert when setting null icons initially (#10138)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/13e451aee24338aabc0a76dbe6eb1c49fe2dd990

wxTLW: don't assert when setting null icons initially (#10138)

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index ec54792ae3..c0657b18bf 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -993,6 +993,14 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
 {
     wxTopLevelWindowBase::SetIcons(icons);
 
+    if ( icons.IsEmpty() )
+    {
+        // FIXME: SetIcons(wxNullIconBundle) should unset existing icons,
+        //        but we currently don't do that
+        wxASSERT_MSG( m_icons.IsEmpty(), "unsetting icons doesn't work" );
+        return;
+    }
+
     if ( !DoSelectAndSetIcon(icons, SM_CXSMICON, SM_CYSMICON, ICON_SMALL) &&
             !DoSelectAndSetIcon(icons, SM_CXICON, SM_CYICON, ICON_BIG) )
     {