X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/206d3a16caa7a4e626395ae52cc8f7e0225e202d..b8bafcaad8c0a94d2a7e09d28fe7df540fb551f5:/samples/typetest/typetest.cpp

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 8ee42c8455..0550ca1a00 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.cpp
-// Purpose:     Types wxWindows sample
+// Purpose:     Types wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -74,7 +74,7 @@ END_EVENT_TABLE()
 bool MyApp::OnInit()
 {
     // Create the main frame window
-    MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWindows Types Demo"),
+    MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Types Demo"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Give it an icon
@@ -138,31 +138,31 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     tmp.Printf( _T("Signed int: %d\n"), si );
     textCtrl.WriteText( tmp );
     text_output << si << _T("\n");
-    std_file_output << si << _T("\n");
+    std_file_output << si << "\n";
 
     unsigned int ui = 0xFFFFFFFF;
     tmp.Printf( _T("Unsigned int: %u\n"), ui );
     textCtrl.WriteText( tmp );
     text_output << ui << _T("\n");
-    std_file_output << ui << _T("\n");
+    std_file_output << ui << "\n";
 
     double d = 2.01234567890123456789;
     tmp.Printf( _T("Double: %f\n"), d );
     textCtrl.WriteText( tmp );
     text_output << d << _T("\n");
-    std_file_output << d << _T("\n");
+    std_file_output << d << "\n";
 
     float f = (float)0.00001;
     tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
     text_output << f << _T("\n");
-    std_file_output << f << _T("\n");
+    std_file_output << f << "\n";
 
     wxString str( _T("Hello!") );
     tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
     text_output << str << _T("\n");
-    std_file_output << str.c_str() << _T("\n");
+    std_file_output << str.ToAscii() << "\n";
 
     textCtrl.WriteText( _T("\nReading from ifstream:\n") );
 
@@ -184,13 +184,11 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
 
-    // Why doesn't this work?
-#if 0
     char std_buf[200];
     std_file_input >> std_buf;
-    tmp.Printf( _T("String: %s\n"), std_buf );
+    str.FromAscii(std_buf);
+    tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
-#endif
 
     textCtrl.WriteText( _T("\nReading from wxFileInputStream:\n") );
 
@@ -728,7 +726,6 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( _T("\nTesting Ungetch():\n\n") );
 
     char ch = 0;
-    size_t pos = 0;
     wxString str;
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
@@ -744,7 +741,7 @@ void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event))
     wxFileInputStream file_input( wxString(_T("test_wx.dat")) );
 
     ch = file_input.GetC();
-    pos = file_input.TellI();
+    size_t pos = file_input.TellI();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
@@ -808,7 +805,6 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
     textCtrl.WriteText( _T("\nTesting Ungetch() in buffered input stream:\n\n") );
 
     char ch = 0;
-    size_t pos = 0;
     wxString str;
 
     textCtrl.WriteText( _T("Writing number 0 to 9 to wxFileOutputStream...\n\n") );
@@ -825,7 +821,7 @@ void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event))
     wxBufferedInputStream buf_input( file_input );
 
     ch = buf_input.GetC();
-    pos = buf_input.TellI();
+    size_t pos = buf_input.TellI();
     str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos );
     textCtrl.WriteText( str );
 
@@ -977,10 +973,11 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
     textCtrl.Clear();
     textCtrl << _T("\nTest byte order macros:\n\n");
 
-    if (wxBYTE_ORDER == wxLITTLE_ENDIAN)
+    #if wxBYTE_ORDER == wxLITTLE_ENDIAN
         textCtrl << _T("This is a little endian system.\n\n");
-    else
+    #else
         textCtrl << _T("This is a big endian system.\n\n");
+    #endif
 
     wxString text;
 
@@ -1078,7 +1075,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    wxMessageDialog dialog(this, _T("Tests various wxWindows types"),
+    wxMessageDialog dialog(this, _T("Tests various wxWidgets types"),
         _T("About Types"), wxYES_NO|wxCANCEL);
 
     dialog.ShowModal();