removed MSWDetachWindowMenu() (part of the MDI change from yesterday which I forgot...

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8f4b26cdf9e8328944ed761d7945c92cd8fb26ee..733c8c7824d2d3c5bc6630bb1c51ab1f4084c154 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -320,8 +320,6 @@ wxWindowMSW::~wxWindowMSW()
 {
     m_isBeingDeleted = TRUE;
 
 {
     m_isBeingDeleted = TRUE;
 

-    MSWDetachWindowMenu();
-

 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )


@@ -2682,38 +2680,6 @@ void wxWindowMSW::MSWDestroyWindow()
 {
 }
 
 {
 }
 

-void wxWindowMSW::MSWDetachWindowMenu()
-{
-#ifndef __WXUNIVERSAL__
-    if ( m_hMenu )
-    {
-        wxChar buf[1024];
-        HMENU hMenu = (HMENU)m_hMenu;
-
-        int N = ::GetMenuItemCount(hMenu);
-        for ( int i = 0; i < N; i++ )
-        {
-            if ( !::GetMenuString(hMenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
-            {
-                wxLogLastError(wxT("GetMenuString"));
-
-                continue;
-            }
-
-            if ( wxStrcmp(buf, _("&Window")) == 0 )
-            {
-                if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) )
-                {
-                    wxLogLastError(wxT("RemoveMenu"));
-                }
-
-                break;
-            }
-        }
-    }
-#endif // __WXUNIVERSAL__
-}
-

 bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
                                            const wxSize& size,
                                            int& x, int& y,
 bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
                                            const wxSize& size,
                                            int& x, int& y,