From c8b204e6fd541515bead44e1be86ab8cb44a35d3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 11 Nov 2001 19:27:35 +0000 Subject: [PATCH] bug fix for using multiline string (i.e. with embedded '\n's) in wxTextCtrl ctor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/textctrl.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 4fdcde3e83..bc78ce19b0 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -297,7 +297,18 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, m_isRich = FALSE; #endif // wxUSE_RICHEDIT - if ( !MSWCreateControl(windowClass, msStyle, pos, size, value) ) + // we need to turn '\n's into "\r\n"s for the multiline controls + wxString valueWin; + if ( m_windowStyle & wxTE_MULTILINE ) + { + valueWin = wxTextFile::Translate(value, wxTextFileType_Dos); + } + else // single line + { + valueWin = value; + } + + if ( !MSWCreateControl(windowClass, msStyle, pos, size, valueWin) ) return FALSE; SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); -- 2.50.0