1. added some tests for setting the fonts
2. don't try touse iso8859-2 encoding by default (error msg is annoying) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -575,13 +575,36 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
|
||||
|
||||
m_horizontal = new MyTextCtrl( this, -1, "Multiline text control with a horizontal scrollbar.",
|
||||
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 )
|
||||
{
|
||||
switch ( wxTheApp->argv[1][0] )
|
||||
{
|
||||
case '2':
|
||||
m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
|
||||
FALSE, "", wxFONTENCODING_ISO8859_2)); //wxFONTENCODING_KOI8));
|
||||
FALSE, "",
|
||||
wxFONTENCODING_ISO8859_2));
|
||||
//wxFONTENCODING_KOI8));
|
||||
//m_horizontal->SetValue("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
||||
m_horizontal->SetValue("<EFBFBD>lu<EFBFBD>ou<EFBFBD>k<EFBFBD> k<><6B> zb<7A>sile <20>e<EFBFBD>tina <20><>");
|
||||
break;
|
||||
|
||||
default:
|
||||
m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
|
||||
FALSE, "",
|
||||
wxFONTENCODING_KOI8));
|
||||
m_horizontal->SetValue("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_horizontal->SetValue("Text in default encoding");
|
||||
}
|
||||
|
||||
m_multitext = new MyTextCtrl( this, -1, "Multi line.",
|
||||
wxPoint(180,10), wxSize(240,70), wxTE_MULTILINE );
|
||||
m_multitext->SetFont(*wxITALIC_FONT);
|
||||
(*m_multitext) << " Appended.";
|
||||
m_multitext->SetInsertionPoint(0);
|
||||
m_multitext->WriteText( "Prepended. " );
|
||||
|
Reference in New Issue
Block a user