Implement hatched/stippled pens/brushes in wxGraphicsContext for Cairo.

[wxWidgets.git] / tests / archive / archivetest.cpp

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index b56777059f4070292bb0e5766ade01513673b818..d6ac25692b4be8f5b94510dee9986becc8977c9d 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -51,9 +51,6 @@ using std::auto_ptr;
 #if defined __DMC__ && __DMC__ >= 0x832
 #   define WXARC_MEMBER_TEMPLATES
 #endif
 #if defined __DMC__ && __DMC__ >= 0x832
 #   define WXARC_MEMBER_TEMPLATES
 #endif

-#if defined __MWERKS__ && __MWERKS__ >= 0x2200
-#   define WXARC_MEMBER_TEMPLATES
-#endif

 #if defined __HP_aCC && __HP_aCC > 33300
 #   define WXARC_MEMBER_TEMPLATES
 #endif
 #if defined __HP_aCC && __HP_aCC > 33300
 #   define WXARC_MEMBER_TEMPLATES
 #endif


@@ -409,7 +406,7 @@ void TempDir::RemoveDir(wxString& path)
 #   define WXARC_pclose(fp)
 #endif
 
 #   define WXARC_pclose(fp)
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #   define WXARC_b "b"
 #else
 #   define WXARC_b
 #   define WXARC_b "b"
 #else
 #   define WXARC_b


@@ -661,7 +658,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
         wxFileName fn(i->first, wxPATH_UNIX);
         TestEntry& entry = *i->second;
         wxDateTime dt = entry.GetDateTime();
         wxFileName fn(i->first, wxPATH_UNIX);
         TestEntry& entry = *i->second;
         wxDateTime dt = entry.GetDateTime();

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

         if (fn.IsDir())
             entry.SetDateTime(wxDateTime());
         else
         if (fn.IsDir())
             entry.SetDateTime(wxDateTime());
         else


@@ -806,7 +803,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
 
         const TestEntry& testEntry = *it->second;
 
 
         const TestEntry& testEntry = *it->second;
 

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

         // On Windows some archivers compensate for Windows DST handling, but
         // other don't, so disable the test for now.
         wxDateTime dt = testEntry.GetDateTime();
         // On Windows some archivers compensate for Windows DST handling, but
         // other don't, so disable the test for now.
         wxDateTime dt = testEntry.GetDateTime();


@@ -950,7 +947,7 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
 
             const TestEntry& testEntry = *it->second;
 
 
             const TestEntry& testEntry = *it->second;
 

-#if 0 //ndef __WXMSW__
+#if 0 //ndef __WINDOWS__

             CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
                                    testEntry.GetDateTime() ==
                                    wxFileName(path).GetModificationTime());
             CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
                                    testEntry.GetDateTime() ==
                                    wxFileName(path).GetModificationTime());


@@ -1300,7 +1297,7 @@ void ArchiveTestSuite::AddCmd(wxArrayString& cmdlist, const wxString& cmd)
 bool ArchiveTestSuite::IsInPath(const wxString& cmd)
 {
     wxString c = cmd.BeforeFirst(wxT(' '));
 bool ArchiveTestSuite::IsInPath(const wxString& cmd)
 {
     wxString c = cmd.BeforeFirst(wxT(' '));

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     c += wxT(".exe");
 #endif
     return !m_path.FindValidPath(c).empty();
     c += wxT(".exe");
 #endif
     return !m_path.FindValidPath(c).empty();