don't use wxVector<wxDataFormat> from wx/clipbrd.h as wxDataFormat definition is...

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 8a22895fc148998b38b22c728366d0d5707c20bd..cbd16a5c030639df7a46f2a0e2eae699aa5220c0 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -72,6 +72,9 @@ wxString file_name2 = wxString(_T("test_wx2.dat"));
 
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Types Demo"),
                                  wxPoint(50, 50), wxSize(450, 340));
@@ -163,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" );
@@ -919,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()
@@ -952,11 +957,10 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
             filetype->GetOpenCommand(&open, params);
 
             textCtrl << _T("MIME information about extension '") << ext << _T('\n')
-                     << _T("\tMIME type: ") << ( !type ? wxT("unknown")
-                                                   : type.c_str() ) << _T('\n')
-                     << _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() )
+                     << _T("\tMIME type: ") << ( !type ? wxString("unknown") : type ) << _T('\n')
+                     << _T("\tDescription: ") << ( !desc ? wxString(wxEmptyString) : desc )
                         << _T('\n')
-                     << _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() )
+                     << _T("\tCommand to open: ") << ( !open ? wxString("no") : open )
                         << _T('\n');
 
             delete filetype;