X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd1c16314e09a49b6afdc15fadf001acc75856bd..30c4dd918ad3fd79065f5253e012b39e5fe942c8:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 4f69825027..32c83c9b9b 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -27,7 +27,6 @@ #if wxUSE_TEXTCTRL && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) #ifndef WX_PRECOMP - #include "wx/msw/missing.h" #include "wx/textctrl.h" #include "wx/settings.h" #include "wx/brush.h" @@ -52,6 +51,7 @@ #include "wx/msw/private.h" #include "wx/msw/winundef.h" +#include "wx/msw/mslu.h" #include #include @@ -74,6 +74,8 @@ #endif // wxUSE_RICHEDIT +#include "wx/msw/missing.h" + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -577,9 +579,6 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const // styles which we alaways add by default if ( style & wxTE_MULTILINE ) { - wxASSERT_MSG( !(style & wxTE_PROCESS_ENTER), - wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") ); - msStyle |= ES_MULTILINE | ES_WANTRETURN; if ( !(style & wxTE_NO_VSCROLL) ) {