Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-04 11:25:37 +00:00
parent 55b43eaa02
commit 94972183b9
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/combobox.cpp
View File

@@ -42,7 +42,6 @@
// include <commctrl.h> "properly" // include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h" #include "wx/msw/wrapcctl.h"
#include "wx/msw/wrapshl.h"
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
#include "wx/tooltip.h" #include "wx/tooltip.h"
@@ -418,14 +417,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
// edit control, we must subclass it as well // edit control, we must subclass it as well
if ( !(style & wxCB_READONLY) ) if ( !(style & wxCB_READONLY) )
{ {
const HWND hwndEdit = (HWND)GetEditHWND(); gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(), wxComboEditWndProc);
gs_wndprocEdit = wxSetWindowProc(hwndEdit, wxComboEditWndProc);
if ( style & wxCB_FILENAME )
{
wxEnableFileNameAutoComplete(hwndEdit);
}
} }
// and finally, show the control // and finally, show the control

5
src/msw/textctrl.cpp
View File

@@ -50,7 +50,7 @@
#include <windowsx.h> #include <windowsx.h>
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/msw/wrapshl.h" #include "wx/msw/winundef.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -518,9 +518,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
} }
#endif // wxUSE_RICHEDIT #endif // wxUSE_RICHEDIT
if ( style & wxTE_FILENAME )
wxEnableFileNameAutoComplete(GetHwnd());
gs_wndprocEdit = wxSetWindowProc((HWND)GetHwnd(), gs_wndprocEdit = wxSetWindowProc((HWND)GetHwnd(),
wxTextCtrlWndProc); wxTextCtrlWndProc);