Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (MT)
1999-09-30 08:01:13 +00:00
parent 76e1c2debf
commit 36e2955a64
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/frame.cpp
View File

@@ -154,6 +154,9 @@ wxFrame::~wxFrame()
// For some reason, wxWindows can activate another task altogether // For some reason, wxWindows can activate another task altogether
// when a frame is destroyed after a modal dialog has been invoked. // when a frame is destroyed after a modal dialog has been invoked.
// Try to bring the parent to the top. // 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()) if (GetParent() && GetParent()->GetHWND())
::BringWindowToTop((HWND) GetParent()->GetHWND()); ::BringWindowToTop((HWND) GetParent()->GetHWND());
} }
@@ -668,10 +671,8 @@ bool wxFrame::ProcessCommand(int id)
return FALSE; return FALSE;
wxMenuItem *item = bar->FindItemForId(id); 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)) ;
} }