From 94972183b9ba592cee3a48e7052b3b16d8794dec Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 4 Aug 2006 11:25:37 +0000 Subject: [PATCH] undid last change and removed wxTE/CB_FILENAME style, after looking at GTK+ API it seems that this is not the correct way to do this git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/combobox.cpp | 10 +--------- src/msw/textctrl.cpp | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 8d049cb564..6b3ec7f57f 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -42,7 +42,6 @@ // include "properly" #include "wx/msw/wrapcctl.h" -#include "wx/msw/wrapshl.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -418,14 +417,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, // edit control, we must subclass it as well if ( !(style & wxCB_READONLY) ) { - const HWND hwndEdit = (HWND)GetEditHWND(); - - gs_wndprocEdit = wxSetWindowProc(hwndEdit, wxComboEditWndProc); - - if ( style & wxCB_FILENAME ) - { - wxEnableFileNameAutoComplete(hwndEdit); - } + gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(), wxComboEditWndProc); } // and finally, show the control diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index ab2e41b7a8..3f8402ded1 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -50,7 +50,7 @@ #include #include "wx/msw/private.h" -#include "wx/msw/wrapshl.h" +#include "wx/msw/winundef.h" #include #include @@ -518,9 +518,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, } #endif // wxUSE_RICHEDIT - if ( style & wxTE_FILENAME ) - wxEnableFileNameAutoComplete(GetHwnd()); - gs_wndprocEdit = wxSetWindowProc((HWND)GetHwnd(), wxTextCtrlWndProc); -- 2.50.0