X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ebcfb769f52c756018de75dacf3218ff60a8768..196cc38b26fb577274d307ba664dbc5a3196f301:/src/msw/mdi.cpp

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index a8c09a6952..5869306dda 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -270,19 +270,20 @@ wxMDIParentFrame::~wxMDIParentFrame()
     }
 }
 
+#if wxUSE_MENUS_NATIVE
+
 void wxMDIParentFrame::InternalSetMenuBar()
 {
-//    HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
-
     m_parentFrameActive = TRUE;
 
-    HMENU subMenu = (HMENU) 0;
-    if (GetWindowMenu())
-        subMenu = (HMENU) GetWindowMenu()->GetHMenu();
+    wxMenu *menu = GetWindowMenu();
+    HMENU subMenu = menu ? GetHmenuOf(menu) : 0;
 
     InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu);
 }
 
+#endif // wxUSE_MENUS_NATIVE
+
 void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
 {
     if (m_windowMenu)
@@ -1045,7 +1046,7 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
     // let the default window proc calculate the size of MDI children
     // frames because it is based on the size of the MDI client window,
     // not on the values specified in wxWindow m_max variables
-    bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo);
+    bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0;
 
     // but allow GetSizeHints() to set the min size
     if ( m_minWidth != -1 )