fix focus callbacks incorrectly called during frame destruction

svn: r11516
This commit is contained in:
Matthew Flatt 2008-09-02 01:54:16 +00:00
parent 1bba772e84
commit 8ed6a0c00f

View File

@ -387,6 +387,8 @@ wxFrame::~wxFrame(void)
{
CWindowPtr theMacWindow;
cFocusWindow = NULL; /* don't try to de-focus while hiding */
if (IsVisible())
Show(FALSE);
@ -1100,6 +1102,10 @@ void wxFrame::Show(Bool show)
WindowPtr theMacWindow;
wxChildList *tlw;
/* WARNING: Show(FALSE) might called when the frame is being destroyed.
Don't issue any callbacks at all in that case, because it may be
that a custodian is shutting down an eventspace, etc. */
if (!show == cUserHidden) {
if (show) {
CGrafPtr graf;