Include wx/scrolwin.h and wx/dirdlg.h according to precompiled headers of wx/wx.h...

[wxWidgets.git] / src / msw / mdi.cpp

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 716f22007b502420b79998319f9386b9fe1cde2c..5b7dd5e75ec830e8e32fb01850afb2a84fc3c363 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -63,11 +63,8 @@ extern wxMenu *wxCurrentPopupMenu;
 extern const wxChar *wxMDIFrameClassName;   // from app.cpp
 extern const wxChar *wxMDIChildFrameClassName;
 extern const wxChar *wxMDIChildFrameClassNameNoRedraw;
 extern const wxChar *wxMDIFrameClassName;   // from app.cpp
 extern const wxChar *wxMDIChildFrameClassName;
 extern const wxChar *wxMDIChildFrameClassNameNoRedraw;

-extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);

 extern void wxRemoveHandleAssociation(wxWindow *win);
 
 extern void wxRemoveHandleAssociation(wxWindow *win);
 

-static HWND invalidHandle = 0;
-

 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------


@@ -1176,8 +1173,6 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {

-    invalidHandle = GetHwnd();
-

     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
     // Must make sure this handle is invalidated (set to NULL) since all sorts
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
     // Must make sure this handle is invalidated (set to NULL) since all sorts


@@ -1191,8 +1186,6 @@ void wxMDIChildFrame::MSWDestroyWindow()
     if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL)
         ResetWindowStyle((void*) NULL);
 
     if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL)
         ResetWindowStyle((void*) NULL);
 

-    invalidHandle = 0;
-

     if (m_hMenu)
     {
         ::DestroyMenu((HMENU) m_hMenu);
     if (m_hMenu)
     {
         ::DestroyMenu((HMENU) m_hMenu);