From f032bf3d16d85368509fca6857f8a70ad626c515 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 5 Jun 2003 10:57:59 +0000 Subject: [PATCH] Fixed native dialog bug git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/nativdlg/nativdlg.cpp | 5 ----- src/msw/nativdlg.cpp | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp index 69a9c42b66..6ff49b5b0f 100644 --- a/samples/nativdlg/nativdlg.cpp +++ b/samples/nativdlg/nativdlg.cpp @@ -95,11 +95,6 @@ void MyFrame::OnTest1(wxCommandEvent& event) MyDialog *dialog = new MyDialog; if (dialog->LoadNativeDialog(this, _T("dialog1"))) { -/* - wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName("multitext3", dialog); - if (text) - text->SetValue("wxWindows resource demo"); -*/ dialog->SetModal(TRUE); dialog->ShowModal(); } diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp index 2abb33debe..0b2b1ee94e 100644 --- a/src/msw/nativdlg.cpp +++ b/src/msw/nativdlg.cpp @@ -108,7 +108,20 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name) else wxTopLevelWindows.Append(this); - // FIXME why don't we enum all children here? + // Enumerate all children + HWND hWndNext; + hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD); + + wxWindow* child = NULL; + if (hWndNext) + child = CreateWindowFromHWND(this, (WXHWND) hWndNext); + + while (hWndNext != (HWND) NULL) + { + hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT); + if (hWndNext) + child = CreateWindowFromHWND(this, (WXHWND) hWndNext); + } return TRUE; } -- 2.45.2