Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp
index 66a4cd73c7a9ef0b2dce8b16e066f7cdd91a503c..e40c8105ad1e47a025369a2338e88b20141efbaf 100644 (file)
--- a/tests/streams/ffilestream.cpp
+++ b/tests/streams/ffilestream.cpp
@@ -4,16 +4,12 @@
 // Author:      Hans Van Leemputten
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Hans Van Leemputten
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+// and "wx/cppunit.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -24,18 +20,14 @@
     #include "wx/wx.h"
 #endif
 
-#include "wx/cppunit.h"
 #include "wx/wfstream.h"
 
 #include "bstream.h"
 
-using namespace std;
-using namespace CppUnit;
-
 #define DATABUFFER_SIZE     1024
 
-static const wxString FILENAME_FFILEINSTREAM = _T("ffileinstream.test");
-static const wxString FILENAME_FFILEOUTSTREAM = _T("ffileoutstream.test");
+static const wxString FILENAME_FFILEINSTREAM = wxT("ffileinstream.test");
+static const wxString FILENAME_FFILEOUTSTREAM = wxT("ffileoutstream.test");
 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case
@@ -55,6 +47,7 @@ public:
         CPPUNIT_TEST(Input_Read);
         CPPUNIT_TEST(Input_Eof);
         CPPUNIT_TEST(Input_LastRead);
+        CPPUNIT_TEST(Input_CanRead);
         CPPUNIT_TEST(Input_SeekI);
         CPPUNIT_TEST(Input_TellI);
         CPPUNIT_TEST(Input_Peek);
@@ -74,7 +67,7 @@ protected:
 
 private:
     // Implement base class functions.
-    virtual wxFFileInputStream  *DoCreateInStream();  
+    virtual wxFFileInputStream  *DoCreateInStream();
     virtual wxFFileOutputStream *DoCreateOutStream();
     virtual void DoDeleteOutStream();
 
@@ -85,6 +78,7 @@ private:
 ffileStream::ffileStream()
 {
     m_bSeekInvalidBeyondEnd = false;
+    m_bEofAtLastRead = false;
 }
 
 ffileStream::~ffileStream()
@@ -94,14 +88,14 @@ ffileStream::~ffileStream()
     ::wxRemoveFile(FILENAME_FFILEOUTSTREAM);
 }
 
-wxFFileInputStream *ffileStream::DoCreateInStream()    
-{ 
+wxFFileInputStream *ffileStream::DoCreateInStream()
+{
     wxFFileInputStream *pFileInStream = new wxFFileInputStream(GetInFileName());
     CPPUNIT_ASSERT(pFileInStream->IsOk());
     return pFileInStream;
 }
 wxFFileOutputStream *ffileStream::DoCreateOutStream()
-{ 
+{
     wxFFileOutputStream *pFileOutStream = new wxFFileOutputStream(FILENAME_FFILEOUTSTREAM);
     CPPUNIT_ASSERT(pFileOutStream->IsOk());
     return pFileOutStream;
@@ -123,7 +117,7 @@ wxString ffileStream::GetInFileName() const
         // Make sure we have a input file...
         char buf[DATABUFFER_SIZE];
         wxFFileOutputStream out(FILENAME_FFILEINSTREAM);
-        
+
         // Init the data buffer.
         for (size_t i = 0; i < DATABUFFER_SIZE; i++)
             buf[i] = (i % 0xFF);