remove HWND association when DestroyWindow

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index a9c6967d6390179954f21c7f12ea72ad745ce9b2..25cf16bbce08f8028320d29bde4bde60e584df85 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -68,6 +68,7 @@ extern const wxChar *wxMDIChildFrameClassName;
 extern wxWindow *wxWndHook;                 // from window.cpp
 
 extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
 extern wxWindow *wxWndHook;                 // from window.cpp
 
 extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);

+extern void wxRemoveHandleAssociation(wxWindow *win);

 
 static HWND invalidHandle = 0;
 
 
 static HWND invalidHandle = 0;
 


@@ -1042,6 +1043,7 @@ void wxMDIChildFrame::MSWDestroyWindow()
         ::DestroyMenu((HMENU) m_hMenu);
         m_hMenu = 0;
     }
         ::DestroyMenu((HMENU) m_hMenu);
         m_hMenu = 0;
     }

+    wxRemoveHandleAssociation(this);

     m_hWnd = 0;
 }
 
     m_hWnd = 0;
 }