#include "typetest.h"
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "mondrian.xpm"
#endif
+#ifdef new
+#undef new
+#endif
+
#include "wx/ioswrap.h"
#if wxUSE_IOSTREAMH
IMPLEMENT_DYNAMIC_CLASS (MyApp, wxApp)
BEGIN_EVENT_TABLE(MyApp, wxApp)
+#if wxUSE_TIMEDATE
EVT_MENU(TYPES_DATE, MyApp::DoDateDemo)
EVT_MENU(TYPES_TIME, MyApp::DoTimeDemo)
+#endif // wxUSE_TIMEDATE
EVT_MENU(TYPES_VARIANT, MyApp::DoVariantDemo)
EVT_MENU(TYPES_BYTEORDER, MyApp::DoByteOrderDemo)
#if wxUSE_UNICODE
EVT_MENU(TYPES_UNICODE, MyApp::DoUnicodeDemo)
-#endif
+#endif // wxUSE_UNICODE
EVT_MENU(TYPES_STREAM, MyApp::DoStreamDemo)
EVT_MENU(TYPES_STREAM2, MyApp::DoStreamDemo2)
EVT_MENU(TYPES_STREAM3, MyApp::DoStreamDemo3)
file_menu->Append(TYPES_QUIT, "E&xit\tAlt-X");
wxMenu *test_menu = new wxMenu;
+#if wxUSE_TIMEDATE
test_menu->Append(TYPES_DATE, "&Date test");
+#endif // wxUSE_TIMEDATE
test_menu->Append(TYPES_TIME, "&Time test");
test_menu->Append(TYPES_VARIANT, "&Variant test");
test_menu->Append(TYPES_BYTEORDER, "&Byteorder test");
#if wxUSE_UNICODE
test_menu->Append(TYPES_UNICODE, "&Unicode test");
-#endif
+#endif // wxUSE_UNICODE
test_menu->Append(TYPES_STREAM, "&Stream test");
test_menu->Append(TYPES_STREAM2, "&Stream seek test");
test_menu->Append(TYPES_STREAM3, "&Stream error test");
textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" );
- ofstream std_file_output( "test_std.dat" );
+ wxSTD ofstream std_file_output( "test_std.dat" );
wxFileOutputStream file_output( wxString("test_wx.dat") );
wxBufferedOutputStream buf_output( file_output );
wxTextOutputStream text_output( buf_output );
textCtrl.WriteText( "\nReading from ifstream:\n" );
- ifstream std_file_input( "test_std.dat" );
+ wxSTD ifstream std_file_input( "test_std.dat" );
std_file_input >> si;
tmp.Printf( _T("Signed int: %d\n"), si );
file_output.SeekO( 0 );
wxDataOutputStream data_output( buf_output );
- wxInt16 i16 = (short)0xFFFF;
+ wxInt16 i16 = (unsigned short)0xFFFF;
tmp.Printf( _T("Signed int16: %d\n"), (int)i16 );
textCtrl.WriteText( tmp );
data_output.Write16( i16 );
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" );
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" );
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" );
}
{
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())
{
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())
{
{
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())
{
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())
{
{
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())
{
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())
{
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" );
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" );
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" );
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" );
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" );
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" );
}
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 );
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 );
}
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() );
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;
textCtrl.WriteText( text );
}
+#if wxUSE_TIMEDATE
+
void MyApp::DoTimeDemo(wxCommandEvent& WXUNUSED(event))
{
wxTextCtrl& textCtrl = * GetTextCtrl();
textCtrl << "The last date of this year is " << v4.GetYearEnd() << "\n";
}
+#endif // wxUSE_TIMEDATE
+
void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
{
wxTextCtrl& textCtrl = * GetTextCtrl();