fixed wrong return value and child creation login in GetWindowChild() (includes patch...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 5e6ff9865a637e7c8240f2b7a2b50550a8ed67ba..0f86383b8d4ef0a64c67f352f0750d99ac686eb7 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -146,20 +146,14 @@ wxWindow* wxWindow::GetWindowChild(wxWindowID id)
     wxWindow* win = GetWindowChild1(id);
     if ( !win )
     {
-        HWND hWnd = ::GetDlgItem((HWND) GetHWND(), id);
-
-        if (hWnd)
+        HWND hwnd = ::GetDlgItem(GetHwnd(), id);
+        if ( hwnd )
         {
-            wxWindow* child = CreateWindowFromHWND(this, (WXHWND) hWnd);
-            if (child)
-            {
-                child->AddChild(this);
-                return child;
-            }
+            win = CreateWindowFromHWND(this, (WXHWND) hwnd);
         }
     }
 
-    return NULL;
+    return win;
 }
 
 // ---------------------------------------------------------------------------