Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't overwrite initial controls value, explaining what its style is

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-06-22 23:08:41 +00:00
parent 48e4ba4f82
commit b7f5f3cc75
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/text/text.cpp
View File

@@ -865,8 +865,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
// multi line text controls
m_horizontal = new MyTextCtrl( this, wxID_ANY, _T("Multiline text control with a horizontal scrollbar."),
wxPoint(10,170), wxSize(140,70), wxTE_MULTILINE | wxHSCROLL );
m_horizontal = new MyTextCtrl( this, wxID_ANY, _T("Multiline text control with a horizontal scrollbar.\n"),
wxPoint(10,170), wxSize(140,70), wxTE_MULTILINE | wxHSCROLL);
// a little hack to use the command line argument for encoding testing
if ( wxTheApp->argc == 2 )
@@ -877,14 +877,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
false, _T(""),
wxFONTENCODING_ISO8859_2));
m_horizontal->SetValue(_T("<EFBFBD>lu<EFBFBD>ou<EFBFBD>k<EFBFBD> k<><6B> zb<7A>sile <20>e<EFBFBD>tina <20><>"));
m_horizontal->AppendText(_T("<EFBFBD>lu<EFBFBD>ou<EFBFBD>k<EFBFBD> k<><6B> zb<7A>sile <20>e<EFBFBD>tina <20><>"));
break;
case '1':
m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
false, _T(""),
wxFONTENCODING_CP1251));
m_horizontal->SetValue(_T("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"));
m_horizontal->AppendText(_T("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"));
break;
case '8':
@@ -892,15 +892,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
false, _T(""),
wxFONTENCODING_CP1251));
#if wxUSE_UNICODE
m_horizontal->SetValue(L"\x0412\x0430\x0434\x0438\x043c \x0426");
m_horizontal->AppendText(L"\x0412\x0430\x0434\x0438\x043c \x0426");
#else
m_horizontal->SetValue("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
m_horizontal->AppendText("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
#endif
}
}
else
{
m_horizontal->SetValue(_T("Text in default encoding"));
m_horizontal->AppendText(_T("Text in default encoding"));
}
m_multitext = new MyTextCtrl( this, wxID_ANY, _T("Multi line."),