From 9c88ff79e541770b589fdbf5f90f79aa9d254437 Mon Sep 17 00:00:00 2001 From: David Webster Date: Wed, 31 Oct 2001 21:10:04 +0000 Subject: [PATCH] Some more Multi-Line Text control fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/textctrl.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp index 7aabef5045..0e4b7a4461 100644 --- a/src/os2/textctrl.cpp +++ b/src/os2/textctrl.cpp @@ -159,8 +159,8 @@ bool wxTextCtrl::Create( // if ( m_windowStyle & wxTE_MULTILINE ) { + lSstyle |= MLS_BORDER | MLS_WORDWRAP; m_bIsMLE = TRUE; - m_windowStyle |= wxTE_PROCESS_ENTER; if ((m_windowStyle & wxTE_NO_VSCROLL) == 0) lSstyle |= MLS_VSCROLL; @@ -284,6 +284,14 @@ void wxTextCtrl::SetupColours() vBkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW); SetBackgroundColour(vBkgndColour); SetForegroundColour(GetParent()->GetForegroundColour()); + if (m_bIsMLE) + { + ::WinSendMsg( GetHwnd() + ,MLM_SETTEXTCOLOR + ,(MPARAM)GetParent()->GetForegroundColour().GetPixel() + ,(MPARAM)MLE_RGB + ); + } } // end of wxTextCtrl::SetupColours // ---------------------------------------------------------------------------- -- 2.45.2