Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / tests / streams / largefile.cpp

diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp
index 5533edb664a4ed8e5da648d805d139998189bfa2..9c8e0caf866455ab5a61fa89df61d48c06e5defc 100644 (file)
--- a/tests/streams/largefile.cpp
+++ b/tests/streams/largefile.cpp
@@ -35,7 +35,7 @@
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     #include "wx/msw/wrapwin.h"
     #ifdef __VISUALC__
         // 'nonstandard extension used : nameless struct/union' occurs inside
     #include "wx/msw/wrapwin.h"
     #ifdef __VISUALC__
         // 'nonstandard extension used : nameless struct/union' occurs inside


@@ -220,7 +220,7 @@ protected:
 wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const
 {
     auto_ptr<wxFileInputStream> in(new wxFileInputStream(name));
 wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const
 {
     auto_ptr<wxFileInputStream> in(new wxFileInputStream(name));

-    CPPUNIT_ASSERT(in->Ok());
+    CPPUNIT_ASSERT(in->IsOk());

     return in.release();
 }
 
     return in.release();
 }
 


@@ -252,7 +252,7 @@ protected:
 wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const
 {
     auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(name));
 wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const
 {
     auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(name));

-    CPPUNIT_ASSERT(in->Ok());
+    CPPUNIT_ASSERT(in->IsOk());

     return in.release();
 }
 
     return in.release();
 }
 


@@ -305,7 +305,7 @@ CppUnit::Test *largeFile::suite()
 // are picked up. However this is only possible when sparse files are
 // supported otherwise the tests require too much disk space.
 
 // are picked up. However this is only possible when sparse files are
 // supported otherwise the tests require too much disk space.
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 #ifndef FILE_SUPPORTS_SPARSE_FILES
 #define FILE_SUPPORTS_SPARSE_FILES 0x00000040
 
 #ifndef FILE_SUPPORTS_SPARSE_FILES
 #define FILE_SUPPORTS_SPARSE_FILES 0x00000040


@@ -400,7 +400,7 @@ CppUnit::Test* GetlargeFileSuite()
         return NULL;
 }
 
         return NULL;
 }
 

-#else // __WXMSW__
+#else // __WINDOWS__

 
 bool IsFAT(const wxString& WXUNUSED(path)) { return false; }
 void MakeSparse(const wxString& WXUNUSED(path), int WXUNUSED(fd)) { }
 
 bool IsFAT(const wxString& WXUNUSED(path)) { return false; }
 void MakeSparse(const wxString& WXUNUSED(path), int WXUNUSED(fd)) { }


@@ -436,7 +436,7 @@ CppUnit::Test* GetlargeFileSuite()
         return NULL;
 }
 
         return NULL;
 }
 

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "largeFile");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "Streams.largeFile");
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "largeFile");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "Streams.largeFile");