projects
/
wxWidgets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4dd1256
)
Remove superfluous assert that conflicts with style settings needed on
author
Robin Dunn
<robin@alldunn.com>
Sat, 11 Nov 2006 20:02:07 +0000
(20:02 +0000)
committer
Robin Dunn
<robin@alldunn.com>
Sat, 11 Nov 2006 20:02:07 +0000
(20:02 +0000)
wxGTK to get the same effect.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43314
c3d73ce0
-8a6f-49c7-b76d-
6d57e0e08775
src/msw/textctrl.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/msw/textctrl.cpp
b/src/msw/textctrl.cpp
index 22aacd15488c1266c0904278f1247b96711209cd..32c83c9b9bda15ae90235016aca2b30a5085fde2 100644
(file)
--- a/
src/msw/textctrl.cpp
+++ b/
src/msw/textctrl.cpp
@@
-579,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) )
{