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
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
|
||||
// include <commctrl.h> "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
|
||||
|
@@ -50,7 +50,7 @@
|
||||
#include <windowsx.h>
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/msw/wrapshl.h"
|
||||
#include "wx/msw/winundef.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user