Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / tests / interactive / output.cpp

diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index 6d6294abb898d220923d923900c0b0d17d504d60..3d6492cbcd6e4e7f7d608652fed6c06fb00340ca 100644 (file)
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -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);
@@ -377,7 +373,8 @@ void InteractiveOutputTestCase::TestStackWalk()
 #if wxUSE_STACKWALKER
     wxPuts(wxT("*** Testing wxStackWalker ***"));
 
-    StackDump dump(wxTheApp->argv[0].utf8_str());
+    wxString progname(wxTheApp->argv[0]);
+    StackDump dump(progname.utf8_str());
     dump.Walk();
 
     wxPuts("\n");