added wxICON_NONE and implement support for it in wxGTK (closes #2897)

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

diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp
index 27108f421049b7bb5492e04f8320e40e78310191..9714e1cbb04f916f724717bbd3d608056b18826e 100644 (file)
--- a/tests/streams/ffilestream.cpp
+++ b/tests/streams/ffilestream.cpp
@@ -7,13 +7,9 @@
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 // For compilers that support precompilation, includes "wx/wx.h".

-#include "wx/wxprec.h"
+// and "wx/cppunit.h"
+#include "testprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -24,14 +20,10 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#include "wx/cppunit.h"

 #include "wx/wfstream.h"
 
 #include "bstream.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");
 #define DATABUFFER_SIZE     1024
 
 static const wxString FILENAME_FFILEINSTREAM = _T("ffileinstream.test");


@@ -55,6 +47,7 @@ public:
         CPPUNIT_TEST(Input_Read);
         CPPUNIT_TEST(Input_Eof);
         CPPUNIT_TEST(Input_LastRead);
         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);
         CPPUNIT_TEST(Input_SeekI);
         CPPUNIT_TEST(Input_TellI);
         CPPUNIT_TEST(Input_Peek);


@@ -74,7 +67,7 @@ protected:
 
 private:
     // Implement base class functions.
 
 private:
     // Implement base class functions.

-    virtual wxFFileInputStream  *DoCreateInStream();  
+    virtual wxFFileInputStream  *DoCreateInStream();

     virtual wxFFileOutputStream *DoCreateOutStream();
     virtual void DoDeleteOutStream();
 
     virtual wxFFileOutputStream *DoCreateOutStream();
     virtual void DoDeleteOutStream();
 


@@ -84,7 +77,8 @@ private:
 
 ffileStream::ffileStream()
 {
 
 ffileStream::ffileStream()
 {

-    /* Nothing extra */
+    m_bSeekInvalidBeyondEnd = false;
+    m_bEofAtLastRead = false;

 }
 
 ffileStream::~ffileStream()
 }
 
 ffileStream::~ffileStream()


@@ -94,14 +88,14 @@ ffileStream::~ffileStream()
     ::wxRemoveFile(FILENAME_FFILEOUTSTREAM);
 }
 
     ::wxRemoveFile(FILENAME_FFILEOUTSTREAM);
 }
 

-wxFFileInputStream *ffileStream::DoCreateInStream()    
-{ 
+wxFFileInputStream *ffileStream::DoCreateInStream()
+{

     wxFFileInputStream *pFileInStream = new wxFFileInputStream(GetInFileName());
     CPPUNIT_ASSERT(pFileInStream->IsOk());
     return pFileInStream;
 }
 wxFFileOutputStream *ffileStream::DoCreateOutStream()
     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;
     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);
         // 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);
         // Init the data buffer.
         for (size_t i = 0; i < DATABUFFER_SIZE; i++)
             buf[i] = (i % 0xFF);