Don't set cell value in wxDataViewEvent in one place only.

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

diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index ff462c217676a8ed68dc0a10b50ea92fc001de07..2722ca8952f7d482153e0b83bf91ea0c79f9e973 100644 (file)
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -90,7 +90,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( InteractiveOutputTestCase, "InteractiveOu
 // wxDllLoader
 // ----------------------------------------------------------------------------
 
 // wxDllLoader
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) && !defined(__UNIX__)
+#if !defined(__WINDOWS__) && !defined(__UNIX__)

     #undef TEST_DYNLIB
 #endif
 
     #undef TEST_DYNLIB
 #endif
 


@@ -228,14 +228,10 @@ void InteractiveOutputTestCase::TestMimeAssociate()
 #ifdef TEST_MIME
     wxPuts(wxT("*** Testing creation of filetype association ***\n"));
 
 #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);
     ftInfo.SetShortDesc(wxT("XYZFile")); // used under Win32 only
 
     wxFileType *ft = wxTheMimeTypesManager->Associate(ftInfo);