From 2344c32b7e5872fb04a31e6f20f504d58ac7dab0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 22 Sep 2009 00:22:57 +0000 Subject: [PATCH] Implement wxGetActiveWindow() for wxX11. Now that wxGetActiveWindow() is used when showing modal dialogs, it became critical to implement it as otherwise an assert happens every time a dialog is shown and because creating the assert dialog itself results in another (same) assert, this immediately results in a crash. So implement it even if in a very trivial (but hopefully not too incorrect) way. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/window.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 1857c98868..61db6dee8d 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -1641,9 +1641,7 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col) wxWindow *wxGetActiveWindow() { - // TODO - wxFAIL_MSG(wxT("Not implemented")); - return NULL; + return wxGetTopLevelParent(wxWindow::FindFocus()); } /* static */