only set parent frame ontop when the current frame being destructed is active

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 252fc36d9a20effe10572c1d5d0a52a29bab3bc2..54215fde435db7708449a01b631ed69c3a1c0fcd 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -154,6 +154,9 @@ wxFrame::~wxFrame()
   // For some reason, wxWindows can activate another task altogether
   // when a frame is destroyed after a modal dialog has been invoked.
   // Try to bring the parent to the top.
   // For some reason, wxWindows can activate another task altogether
   // when a frame is destroyed after a modal dialog has been invoked.
   // Try to bring the parent to the top.

+  // MT:Only do this if this frame is currently the active window, else weird
+  // things start to happen
+  if ( wxGetActiveWindow() == this )

   if (GetParent() && GetParent()->GetHWND())
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }
   if (GetParent() && GetParent()->GetHWND())
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }


@@ -668,10 +671,8 @@ bool wxFrame::ProcessCommand(int id)
         return FALSE;
 
     wxMenuItem *item = bar->FindItemForId(id);
         return FALSE;
 
     wxMenuItem *item = bar->FindItemForId(id);

-    if ( !item )
-        return FALSE;

 
 

-    if ( item->IsCheckable() )
+    if ( item &&  item->IsCheckable() )

     {
         bar->Check(id, !bar->IsChecked(id)) ;
     }
     {
         bar->Check(id, !bar->IsChecked(id)) ;
     }