Fixed problems with wxFrame::SetIcons

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-28 20:51:55 +00:00
parent 33980f0da6
commit 7efaed4de4
4 changed files with 21 additions and 16 deletions
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -32,7 +32,8 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
    size_t i, max = ib.m_icons.GetCount();

    for( i = 0; i < max; ++i )
-        size += 2 + ib.m_icons[i].GetWidth() * ib.m_icons[i].GetHeight();
+        if( ib.m_icons[i].Ok() )
+            size += 2 + ib.m_icons[i].GetWidth() * ib.m_icons[i].GetHeight();

    Atom net_wm_icon = XInternAtom( (Display*)display, "_NET_WM_ICON", 0 );