]> git.saurik.com Git - wxWidgets.git/commitdiff
Implement wxGetActiveWindow() for wxX11.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 22 Sep 2009 00:22:57 +0000 (00:22 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 22 Sep 2009 00:22:57 +0000 (00:22 +0000)
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

index 1857c9886810ff004ac1b69779b55d3a558d8f27..61db6dee8d880544b931703b2a9fa28902c3059b 100644 (file)
@@ -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 */