using button impl

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

diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index 4c33078b9f2d6740acce95515aa68a5df95c6d14..2722ca8952f7d482153e0b83bf91ea0c79f9e973 100644 (file)
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -22,6 +22,8 @@
 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"

+#include "wx/wxcrt.h"           // for wxPuts
+#include "wx/wxcrtvararg.h"     // for wxPrintf

 
 // ----------------------------------------------------------------------------
 // conditional compilation
 
 // ----------------------------------------------------------------------------
 // conditional compilation


@@ -88,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
 


@@ -117,7 +119,7 @@ void InteractiveOutputTestCase::TestDllListLoaded()
 
         printf(" %s\n", (const char *)details.GetVersion().mb_str());
     }
 
         printf(" %s\n", (const char *)details.GetVersion().mb_str());
     }

-    
+

     wxPuts(wxEmptyString);
 #endif // TEST_DYNLIB
 }
     wxPuts(wxEmptyString);
 #endif // TEST_DYNLIB
 }


@@ -226,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);


@@ -315,6 +313,8 @@ void InteractiveOutputTestCase::TestUserInfo()
 // stack backtrace
 // ----------------------------------------------------------------------------
 
 // stack backtrace
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STACKWALKER
+

 #include "wx/stackwalk.h"
 
 class StackDump : public wxStackWalker
 #include "wx/stackwalk.h"
 
 class StackDump : public wxStackWalker


@@ -365,16 +365,20 @@ protected:
         }
     }
 };
         }
     }
 };

+#endif

 
 void InteractiveOutputTestCase::TestStackWalk()
 {
 #ifdef TEST_STACKWALKER
 
 void InteractiveOutputTestCase::TestStackWalk()
 {
 #ifdef TEST_STACKWALKER

+#if wxUSE_STACKWALKER

     wxPuts(wxT("*** Testing wxStackWalker ***"));
 
     wxPuts(wxT("*** Testing wxStackWalker ***"));
 

-    StackDump dump(wxTheApp->argv[0]);
+    wxString progname(wxTheApp->argv[0]);
+    StackDump dump(progname.utf8_str());

     dump.Walk();
     dump.Walk();

-    
+

     wxPuts("\n");
     wxPuts("\n");

+#endif

 #endif // TEST_STACKWALKER
 }
 
 #endif // TEST_STACKWALKER
 }
 


@@ -412,7 +416,7 @@ void InteractiveOutputTestCase::TestStandardPaths()
                     wxT("fr"),
                     wxStandardPaths::ResourceCat_Messages
                   ).c_str());
                     wxT("fr"),
                     wxStandardPaths::ResourceCat_Messages
                   ).c_str());

-                  
+

     wxPuts("\n");
 #endif // TEST_STDPATHS
 }
     wxPuts("\n");
 #endif // TEST_STDPATHS
 }


@@ -475,7 +479,7 @@ void InteractiveOutputTestCase::TestFSVolume()
                  vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")
                                                      : wxT("fixed"));
     }
                  vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")
                                                      : wxT("fixed"));
     }

-    
+

     wxPuts("\n");
 #endif // TEST_VOLUME
 }
     wxPuts("\n");
 #endif // TEST_VOLUME
 }