make sure we are removing ourselves from the focus of the toplevel frame when deleting (copied from msw)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-26 07:53:42 +00:00
parent b821344e13
commit d4380aafdd
2 changed files with 32 additions and 0 deletions

View File

@@ -148,6 +148,22 @@ wxWindowMac::~wxWindowMac()
m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
{
wxFrame *frame = wxDynamicCast(win, wxFrame);
if ( frame )
{
if ( frame->GetLastFocus() == this )
{
frame->SetLastFocus((wxWindow*)NULL);
}
break;
}
}
#endif // __WXUNIVERSAL__
if ( s_lastMouseWindow == this )
{
s_lastMouseWindow = NULL ;

View File

@@ -148,6 +148,22 @@ wxWindowMac::~wxWindowMac()
m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
{
wxFrame *frame = wxDynamicCast(win, wxFrame);
if ( frame )
{
if ( frame->GetLastFocus() == this )
{
frame->SetLastFocus((wxWindow*)NULL);
}
break;
}
}
#endif // __WXUNIVERSAL__
if ( s_lastMouseWindow == this )
{
s_lastMouseWindow = NULL ;