Restore control focus after adaptation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-21 11:48:53 +00:00
parent 1fe91d7098
commit 3e84eb5fa2
1 changed files with 11 additions and 1 deletions
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -480,7 +480,17 @@ void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 bool wxDialogBase::DoLayoutAdaptation()
 {
    if (GetLayoutAdapter())
-        return GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this);
+    {
+        wxWindow* focusWindow = wxFindFocusDescendant(this); // from event.h
+        if (GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this))
+        {
+            if (focusWindow)
+                focusWindow->SetFocus();
+            return true;
+        }
+        else
+            return false;
+    }
    else
        return false;
 }