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

Unicode compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-09-21 20:21:44 +00:00
parent eb71219dd0
commit 4693b20c75
40 changed files with 428 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
samples/typetest/typetest.cpp
View File

@@ -295,7 +295,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
for (ch2 = 0; ch2 < 10; ch2++)
{
file_input.Read( &ch, 1 );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
}
textCtrl.WriteText( "\n\n\n" );
@@ -315,7 +315,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
for (ch2 = 0; ch2 < 10; ch2++)
{
file_input2.Read( &ch, 1 );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
}
textCtrl.WriteText( "\n\n\n" );
@@ -334,14 +334,14 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
for (ch2 = 0; ch2 < 10; ch2++)
{
buf_input3.Read( &ch, 1 );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
}
for (int j = 0; j < 2000; j++)
buf_input3.Read( &ch, 1 );
textCtrl.WriteText( "\n" );
buf_input3.SeekI( 3 );
buf_input3.Read( &ch, 1 );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "\n\n\n" );
}
@@ -370,7 +370,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
{
file_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (file_input.LastError())
{
@@ -397,7 +397,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
file_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (file_input.LastError())
{
@@ -419,7 +419,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
{
ffile_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (ffile_input.LastError())
{
@@ -446,7 +446,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
ffile_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (ffile_input.LastError())
{
@@ -468,7 +468,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
{
buf_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (buf_input.LastError())
{
@@ -495,7 +495,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
buf_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (char)(ch + '0') );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (buf_input.LastError())
{
@@ -540,9 +540,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
default: textCtrl.WriteText( "Huh?\n" ); break;
}
msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
textCtrl.WriteText( msg );
msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
textCtrl.WriteText( msg );
textCtrl.WriteText( "\n\n" );
@@ -560,9 +560,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
default: textCtrl.WriteText( "Huh?\n" ); break;
}
msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
textCtrl.WriteText( msg );
msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
textCtrl.WriteText( msg );
textCtrl.WriteText( "\n\n" );
@@ -582,9 +582,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
default: textCtrl.WriteText( "Huh?\n" ); break;
}
msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
textCtrl.WriteText( msg );
msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
textCtrl.WriteText( msg );
textCtrl.WriteText( "\n\n" );
@@ -601,9 +601,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
default: textCtrl.WriteText( "Huh?\n" ); break;
}
msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
textCtrl.WriteText( msg );
msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
textCtrl.WriteText( msg );
textCtrl.WriteText( "\n\n" );
@@ -620,9 +620,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
default: textCtrl.WriteText( "Huh?\n" ); break;
}
msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
textCtrl.WriteText( msg );
msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
textCtrl.WriteText( msg );
textCtrl.WriteText( "\n\n" );
@@ -639,9 +639,9 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
default: textCtrl.WriteText( "Huh?\n" ); break;
}
msg.Printf( "wxBufferedInputStream.LastRead() returns: %d\n", (int)buf_input.LastRead() );
msg.Printf( wxT("wxBufferedInputStream.LastRead() returns: %d\n"), (int)buf_input.LastRead() );
textCtrl.WriteText( msg );
msg.Printf( "wxBufferedInputStream.TellI() returns: %d\n", (int)buf_input.TellI() );
msg.Printf( wxT("wxBufferedInputStream.TellI() returns: %d\n"), (int)buf_input.TellI() );
textCtrl.WriteText( msg );
textCtrl.WriteText( "\n\n" );
}
@@ -667,27 +667,27 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
wxFileInputStream file_input( wxString("test_wx.dat") );
ch = file_input.Peek();
str.Printf( "First char peeked: %d\n", (int) ch );
str.Printf( wxT("First char peeked: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = file_input.GetC();
str.Printf( "First char read: %d\n", (int) ch );
str.Printf( wxT("First char read: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = file_input.Peek();
str.Printf( "Second char peeked: %d\n", (int) ch );
str.Printf( wxT("Second char peeked: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = file_input.GetC();
str.Printf( "Second char read: %d\n", (int) ch );
str.Printf( wxT("Second char read: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = file_input.Peek();
str.Printf( "Third char peeked: %d\n", (int) ch );
str.Printf( wxT("Third char peeked: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = file_input.GetC();
str.Printf( "Third char read: %d\n", (int) ch );
str.Printf( wxT("Third char read: %d\n"), (int) ch );
textCtrl.WriteText( str );
@@ -697,27 +697,27 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
wxMemoryInputStream input( buf, 10 );
ch = input.Peek();
str.Printf( "First char peeked: %d\n", (int) ch );
str.Printf( wxT("First char peeked: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = input.GetC();
str.Printf( "First char read: %d\n", (int) ch );
str.Printf( wxT("First char read: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = input.Peek();
str.Printf( "Second char peeked: %d\n", (int) ch );
str.Printf( wxT("Second char peeked: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = input.GetC();
str.Printf( "Second char read: %d\n", (int) ch );
str.Printf( wxT("Second char read: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = input.Peek();
str.Printf( "Third char peeked: %d\n", (int) ch );
str.Printf( wxT("Third char peeked: %d\n"), (int) ch );
textCtrl.WriteText( str );
ch = input.GetC();
str.Printf( "Third char read: %d\n", (int) ch );
str.Printf( wxT("Third char read: %d\n"), (int) ch );
textCtrl.WriteText( str );
}
@@ -735,11 +735,11 @@ void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
printf( "\n\nConversion with wxConvLocal:\n" );
wxConvCurrent = &wxConvLocal;
printf( (const char*) str.mbc_str() );
#if defined(__WXGTK__)
printf( "\n\nConversion with wxConvGdk:\n" );
wxConvCurrent = &wxConvGdk;
printf( (const char*) str.mbc_str() );
#endif
printf( "\n\nConversion with wxConvLibc:\n" );
wxConvCurrent = &wxConvLibc;
printf( (const char*) str.mbc_str() );
@@ -802,11 +802,11 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
filetype->GetOpenCommand(&open, params);
textCtrl << "MIME information about extension '" << ext << "'\n"
<< "\tMIME type: " << ( !type ? "unknown"
<< "\tMIME type: " << ( !type ? wxT("unknown")
: type.c_str() ) << '\n'
<< "\tDescription: " << ( !desc ? "" : desc.c_str() )
<< "\tDescription: " << ( !desc ? wxT("") : desc.c_str() )
<< '\n'
<< "\tCommand to open: " << ( !open ? "no" : open.c_str() )
<< "\tCommand to open: " << ( !open ? wxT("no") : open.c_str() )
<< '\n';
delete filetype;