X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ddd4f327f7234d434b5de6938bd338d8677825cd..17beda75ef9780ebef5044e41889a9b598dcf186:/tests/interactive/output.cpp?ds=sidebyside

diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index 2e7358822c..2722ca8952 100644
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -90,7 +90,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( InteractiveOutputTestCase, "InteractiveOu
 // wxDllLoader
 // ----------------------------------------------------------------------------
 
-#if !defined(__WXMSW__) && !defined(__UNIX__)
+#if !defined(__WINDOWS__) && !defined(__UNIX__)
     #undef TEST_DYNLIB
 #endif
 
@@ -119,7 +119,7 @@ void InteractiveOutputTestCase::TestDllListLoaded()
 
         printf(" %s\n", (const char *)details.GetVersion().mb_str());
     }
-    
+
     wxPuts(wxEmptyString);
 #endif // TEST_DYNLIB
 }
@@ -228,14 +228,10 @@ void InteractiveOutputTestCase::TestMimeAssociate()
 #ifdef TEST_MIME
     wxPuts(wxT("*** Testing creation of filetype association ***\n"));
 
-    wxFileTypeInfo ftInfo(
-                            wxT("application/x-xyz"),
-                            wxT("xyzview '%s'"), // open cmd
-                            wxT(""),             // print cmd
-                            wxT("XYZ File"),     // description
-                            wxT(".xyz"),         // extensions
-                            wxNullPtr           // end of extensions
-                         );
+    wxFileTypeInfo ftInfo("application/x-xyz");
+    ftInfo.SetOpenCommand("xyzview '%s'");
+    ftInfo.SetDescription("XYZ File");
+    ftInfo.AddExtension(".xyz");
     ftInfo.SetShortDesc(wxT("XYZFile")); // used under Win32 only
 
     wxFileType *ft = wxTheMimeTypesManager->Associate(ftInfo);
@@ -328,7 +324,7 @@ public:
         : wxStackWalker(argv0)
     {
     }
-    
+
     virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH)
     {
         wxPuts(wxT("Stack dump:"));
@@ -377,9 +373,10 @@ void InteractiveOutputTestCase::TestStackWalk()
 #if wxUSE_STACKWALKER
     wxPuts(wxT("*** Testing wxStackWalker ***"));
 
-    StackDump dump((const char*)wxTheApp->argv[0]);
+    wxString progname(wxTheApp->argv[0]);
+    StackDump dump(progname.utf8_str());
     dump.Walk();
-    
+
     wxPuts("\n");
 #endif
 #endif // TEST_STACKWALKER
@@ -419,7 +416,7 @@ void InteractiveOutputTestCase::TestStandardPaths()
                     wxT("fr"),
                     wxStandardPaths::ResourceCat_Messages
                   ).c_str());
-                  
+
     wxPuts("\n");
 #endif // TEST_STDPATHS
 }
@@ -482,7 +479,7 @@ void InteractiveOutputTestCase::TestFSVolume()
                  vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")
                                                      : wxT("fixed"));
     }
-    
+
     wxPuts("\n");
 #endif // TEST_VOLUME
 }