From 66858adfc41bd8b795fa5a7bab7c51bc2f54b2af Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 17 Mar 2002 21:44:31 +0000 Subject: [PATCH] better handling situation when active frame is destroyed or hidden git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mgl/window.cpp | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index f7423ea103..36baf4f2cb 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -569,12 +569,17 @@ wxWindowMGL::~wxWindowMGL() if (gs_activeFrame == this) { - gs_activeFrame = NULL; - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; - win->SetFocus(); + gs_activeFrame = NULL; + // activate next frame in Z-order: + if ( m_wnd->prev ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; + win->SetFocus(); + } + else if ( m_wnd->next ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData; + win->SetFocus(); } } @@ -760,11 +765,20 @@ bool wxWindowMGL::Show(bool show) if (!show && gs_activeFrame == this) { - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; - win->SetFocus(); + // activate next frame in Z-order: + if ( m_wnd->prev ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; + win->SetFocus(); + } + else if ( m_wnd->next ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData; + win->SetFocus(); + } + else + { + gs_activeFrame = NULL; } } -- 2.50.0