wx_USEIOSTREAMH changes

[wxWidgets.git] / src / common / fstream.cpp

diff --git a/src/common/fstream.cpp b/src/common/fstream.cpp
index 4014d31031a1c5267af7ac0f01c2b861fdfba59a..7012e2b20a5fbd222f3fc22330b4f1ce03432962 100644 (file)
--- a/src/common/fstream.cpp
+++ b/src/common/fstream.cpp
@@ -23,20 +23,29 @@
 #pragma hdrstop
 #endif
 
-#define BUF_TEMP_SIZE 10000
-
 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------
 
 wxFileInputStream::wxFileInputStream(const wxString& fileName)
-  : wxFile(fileName, read)
+  : wxInputStream()
 {
+  m_file = new wxFile(fileName, wxFile::read);
+  m_file_destroy = TRUE;
   m_i_streambuf->SetBufferIO(1024);
 }
 
+wxFileInputStream::wxFileInputStream()
+  : wxInputStream()
+{
+  m_file_destroy = FALSE;
+  m_file = NULL;
+}
+
 wxFileInputStream::~wxFileInputStream()
 {
+  if (m_file_destroy)
+    delete m_file;
 }
 
 char wxFileInputStream::Peek()
@@ -44,19 +53,19 @@ char wxFileInputStream::Peek()
   return 0;
 }
 
-size_t wxFileInputStream::DoRead(void *buffer, size_t size)
+size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
-  return wxFile::Read(buffer, size);
+  return m_file->Read(buffer, size);
 }
 
-off_t wxFileInputStream::DoSeekInput(off_t pos, wxSeekMode mode)
+off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
-  return wxFile::Seek(pos, mode);
+  return m_file->Seek(pos, mode);
 }
 
-off_t wxFileInputStream::DoTellInput() const
+off_t wxFileInputStream::OnSysTell() const
 {
-  return wxFile::Tell();
+  return m_file->Tell();
 }
 
 // ----------------------------------------------------------------------------
@@ -64,48 +73,47 @@ off_t wxFileInputStream::DoTellInput() const
 // ----------------------------------------------------------------------------
 
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
- : wxFile(fileName, write)
 {
+  m_file = new wxFile(fileName, wxFile::write);
+  m_file_destroy = TRUE;
   m_o_streambuf->SetBufferIO(1024);
 }
 
+wxFileOutputStream::wxFileOutputStream()
+  : wxOutputStream()
+{
+  m_o_streambuf->SetBufferIO(1024);
+  m_file_destroy = FALSE;
+  m_file = NULL;
+}
+
 wxFileOutputStream::~wxFileOutputStream()
 {
-  Sync();
+  if (m_file_destroy) {
+    Sync();
+    delete m_file;
+  }
 }
 
-size_t wxFileOutputStream::DoWrite(const void *buffer, size_t size)
+size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-  size_t ret = wxFile::Write(buffer, size);
-  m_bad = wxFile::Error();
+  size_t ret = m_file->Write(buffer, size);
+  m_lasterror = wxStream_EOF; // TODO
   return ret;
 }
 
-off_t wxFileOutputStream::DoTellOutput() const
+off_t wxFileOutputStream::OnSysTell() const
 {
-  return wxFile::Tell();
+  return m_file->Tell();
 }
 
-off_t wxFileOutputStream::DoSeekOutput(off_t pos, wxSeekMode mode)
+off_t wxFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
-  return wxFile::Seek(pos, mode);
+  return m_file->Seek(pos, mode);
 }
 
 void wxFileOutputStream::Sync()
 {
   wxOutputStream::Sync();
-  wxFile::Flush();
-}
-
-// ----------------------------------------------------------------------------
-// wxFileStream
-// ----------------------------------------------------------------------------
-
-wxFileStream::wxFileStream(const wxString& fileName)
-  : wxFile(fileName, read_write)
-{
-}
-
-wxFileStream::~wxFileStream()
-{
+  m_file->Flush();
 }