changes to make wxWindow::FindFocus work as expected with composite controls

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 14:34:28 +00:00
parent adfea104dc
commit 0fe0275981
14 changed files with 33 additions and 13 deletions
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -475,7 +475,7 @@ void wxWindowOS2::SetFocusFromKbd()
    wxWindowBase::SetFocusFromKbd();
 } // end of wxWindowOS2::SetFocus

-wxWindow* wxWindowBase::FindFocus()
+wxWindow* wxWindowBase::DoFindFocus()
 {
    HWND                            hWnd = ::WinQueryFocus(HWND_DESKTOP);

@@ -484,7 +484,7 @@ wxWindow* wxWindowBase::FindFocus()
        return wxFindWinFromHandle((WXHWND)hWnd);
    }
    return NULL;
-} // wxWindowBase::FindFocus
+} // wxWindowBase::DoFindFocus

 bool wxWindowOS2::Enable(
  bool                              bEnable
--- a/src/os2/wx25.def
+++ b/src/os2/wx25.def
@@ -14262,7 +14262,7 @@ EXPORTS
      DoMoveWindow__8wxWindowFiN31
      ;wxWindow::DoClientToScreen(int*,int*) const
      DoClientToScreen__8wxWindowCFPiT1
-      ;wxWindowBase::FindFocus()
+      ;wxWindowBase::DoFindFocus()
      FindFocus__12wxWindowBaseFv
      ;wxWindow::OS2OnDrawItem(int,void**)
      OS2OnDrawItem__8wxWindowFiPPv