fixed assertion failures with invalid icons

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

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 50d699434311d9a67a140972a061a41037bd4603..85b77294367cd09dc9e7033171952708ed81380d 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -3294,8 +3294,11 @@ void wxWin32Renderer::DrawFrameIcon(wxDC& dc,
                                     const wxIcon& icon,
                                     int flags)
 {
                                     const wxIcon& icon,
                                     int flags)
 {

-    wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR);
-    dc.DrawIcon(icon, r.x, r.y);
+    if ( icon.Ok() )
+    {
+        wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR);
+        dc.DrawIcon(icon, r.x, r.y);
+    }

 }
 
 void wxWin32Renderer::DrawFrameButton(wxDC& dc,
 }
 
 void wxWin32Renderer::DrawFrameButton(wxDC& dc,