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
This commit is contained in:
@@ -297,7 +297,18 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
|
|||||||
m_isRich = FALSE;
|
m_isRich = FALSE;
|
||||||
#endif // wxUSE_RICHEDIT
|
#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;
|
return FALSE;
|
||||||
|
|
||||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
|
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
|
||||||
|
Reference in New Issue
Block a user