From 9aa21ba1712cde83a77333988b9a542568d6028c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 14 Jun 2006 15:55:43 +0000 Subject: [PATCH] fixed wrong return value and child creation login in GetWindowChild() (includes patch 1506083) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/nativdlg.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp index 5e6ff9865a..0f86383b8d 100644 --- 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; } // --------------------------------------------------------------------------- -- 2.50.0