X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dea816bd23cb4650c8885b8559dffd59d5f1bd4..HEAD:/tests/streams/textstreamtest.cpp diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp index a2b2ecc878..ed73497002 100644 --- a/tests/streams/textstreamtest.cpp +++ b/tests/streams/textstreamtest.cpp @@ -3,7 +3,6 @@ // Purpose: wxTextXXXStream unit test // Author: Ryan Norton, Vince Harron // Created: 2004-08-14 -// RCS-ID: $Id$ // Copyright: (c) 2004 Ryan Norton, (c) 2006 Vince Harron /////////////////////////////////////////////////////////////////////////////// @@ -86,14 +85,14 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION( TextStreamTestCase ); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TextStreamTestCase, "TextStreamTestCase" ); TextStreamTestCase::TextStreamTestCase() { } -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WINDOWS__) || defined(__WXPM__) # define NEWLINE "\r\n" # define NEWLINELEN 2 #elif defined(__WXMAC__) && !defined(__DARWIN__) @@ -129,7 +128,7 @@ void TextStreamTestCase::MiscTests() { wxString filename = wxT("testdata.fc"); wxFileInputStream fsIn(filename); - if ( !fsIn.Ok() ) + if ( !fsIn.IsOk() ) { return; }