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

don't crash when restoring focus after showing a modal dialog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-01-22 11:26:20 +00:00
parent 368ba124ef
commit af77752fc0
2 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mac/carbon/dialog.cpp
View File

@@ -167,18 +167,8 @@ void wxDialog::DoShowModal()
wxModalDialogs.Append(this);
wxWindow *parent = GetParent();
wxWindow *parent = GetParent();
// remember where the focus was
wxWindow *winFocus = FindFocus();
if ( !winFocus )
{
winFocus = parent;
}
if ( !winFocus )
{
winFocus = wxTheApp->GetTopWindow();
}
#if TARGET_CARBON
BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ;
#else
@@ -198,13 +188,6 @@ void wxDialog::DoShowModal()
// TODO probably reenable the parent window if any
s_macIsInModalLoop = formerModal ;
#endif
// and restore focus
if ( winFocus )
{
winFocus->SetFocus();
}
}

19
src/mac/dialog.cpp
View File

@@ -167,18 +167,8 @@ void wxDialog::DoShowModal()
wxModalDialogs.Append(this);
wxWindow *parent = GetParent();
wxWindow *parent = GetParent();
// remember where the focus was
wxWindow *winFocus = FindFocus();
if ( !winFocus )
{
winFocus = parent;
}
if ( !winFocus )
{
winFocus = wxTheApp->GetTopWindow();
}
#if TARGET_CARBON
BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ;
#else
@@ -198,13 +188,6 @@ void wxDialog::DoShowModal()
// TODO probably reenable the parent window if any
s_macIsInModalLoop = formerModal ;
#endif
// and restore focus
if ( winFocus )
{
winFocus->SetFocus();
}
}