From 13e451aee24338aabc0a76dbe6eb1c49fe2dd990 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 31 Oct 2008 10:06:19 +0000 Subject: [PATCH] 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 --- src/msw/toplevel.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) 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) ) { -- 2.47.2