fixed stupid memory leak

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 02d6431d796c73d5b037861a39fb4c6dda9d7c1f..7b171f9f7cc9c4d11ec8c01ef07129881ab0c8e4 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -301,11 +301,14 @@ wxWindow::~wxWindow()
         }
     }
 
         }
     }
 

+    // VS: destroy children first and _then_ detach *this from its parent.
+    //     If we'd do it the other way around, children wouldn't be able
+    //     find their parent frame (see above).
+    DestroyChildren();
+

     if ( m_parent )
         m_parent->RemoveChild(this);
 
     if ( m_parent )
         m_parent->RemoveChild(this);
 

-    DestroyChildren();
-

     if ( m_hWnd )
     {
         // VZ: test temp removed to understand what really happens here
     if ( m_hWnd )
     {
         // VZ: test temp removed to understand what really happens here


@@ -2258,13 +2261,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 wxPoint pt(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
 
                 wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt);
                 wxPoint pt(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
 
                 wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt);

-                GetEventHandler()->ProcessEvent(evtCtx);
-
-                // set processed to true even if the event is not handled
-                // because if we don't windows will propogate the
-                // WM_CONTEXTMENU up the parent window chain, which we have
-                // already done ourselves.
-                processed = true;
+                processed = GetEventHandler()->ProcessEvent(evtCtx);

             }
             break;
 #endif // __WIN32__
             }
             break;
 #endif // __WIN32__