moved many things from wxString reference page to the wxString overview; updated...

[wxWidgets.git] / samples / typetest / typetest.cpp

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 2dffb5f4176deeca458dbcf73bcafa9c37d17f56..cbd16a5c030639df7a46f2a0e2eae699aa5220c0 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -166,6 +166,8 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     text_output << str << _T("\n");
     std_file_output << str.ToAscii() << "\n";
 
+    std_file_output.close();
+
     textCtrl.WriteText( _T("\nReading from ifstream:\n") );
 
     wxSTD ifstream std_file_input( "test_std.dat" );
@@ -922,12 +924,12 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
                                _T("XyZ %s"),
                                _T("XyZ -p %s"),
                                _T("The one and only XYZ format file"),
-                               _T("xyz"), _T("123"), NULL),
+                               _T("xyz"), _T("123"), wxNullPtr),
                 wxFileTypeInfo(_T("text/html"),
                                _T("lynx %s"),
                                _T("lynx -dump %s | lpr"),
                                _T("HTML document (from fallback)"),
-                               _T("htm"), _T("html"), NULL),
+                               _T("htm"), _T("html"), wxNullPtr),
 
                 // must terminate the table with this!
                 wxFileTypeInfo()