X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98a02e87ad44d233e8a85a874e62e3b2ca467f61..f0e5a44df103e880f57416f483e8f3f4b4bc9651:/src/msw/frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 06e51b1f68..4d0045e878 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -169,6 +169,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 void wxFrame::Init()
 {
+#if wxUSE_MENUS
+    m_hMenu = NULL;
+#endif // wxUSE_MENUS
+
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
@@ -659,7 +663,7 @@ void wxFrame::IconizeChildFrames(bool bIconize)
         wxFrame *frame = wxDynamicCast(win, wxFrame);
         if ( frame
 #if wxUSE_MDI_ARCHITECTURE
-                && !wxDynamicCast(frame, wxMDIChildFrame)
+                && !IsMDIChild()
 #endif // wxUSE_MDI_ARCHITECTURE
            )
         {