X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e6e6f8ab806b337dffeb3b52fec7eba3c845ef..3e109f6d7863ebdb97d2d24cef14e516cf907d4e:/samples/typetest/typetest.cpp

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 1e5ce86779..4b5906cecd 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -922,12 +922,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()
@@ -955,11 +955,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;