OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.

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

diff --git a/src/common/fstream.cpp b/src/common/fstream.cpp
index 69bb1ea670d1aa5e08f12cffdca5761f61d2f6cd..e631cde60df3e42f635dd662b7f48177b7f69c45 100644 (file)
--- a/src/common/fstream.cpp
+++ b/src/common/fstream.cpp
@@ -28,13 +28,24 @@
 // ----------------------------------------------------------------------------
 
 wxFileInputStream::wxFileInputStream(const wxString& fileName)
 // ----------------------------------------------------------------------------
 
 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);
 }
 
   m_i_streambuf->SetBufferIO(1024);
 }
 

+wxFileInputStream::wxFileInputStream()
+  : wxInputStream()
+{
+  m_file_destroy = FALSE;
+  m_file = NULL;
+}
+

 wxFileInputStream::~wxFileInputStream()
 {
 wxFileInputStream::~wxFileInputStream()
 {

+  if (m_file_destroy)
+    delete m_file;

 }
 
 char wxFileInputStream::Peek()
 }
 
 char wxFileInputStream::Peek()


@@ -42,19 +53,24 @@ char wxFileInputStream::Peek()
   return 0;
 }
 
   return 0;
 }
 

-size_t wxFileInputStream::DoRead(void *buffer, size_t size)
+size_t wxFileInputStream::StreamSize() const
+{
+  return m_file->Length();
+}
+
+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();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -62,48 +78,67 @@ off_t wxFileInputStream::DoTellInput() const
 // ----------------------------------------------------------------------------
 
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 // ----------------------------------------------------------------------------
 
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)

- : wxFile(fileName, write)

 {
 {

+  m_file = new wxFile(fileName, wxFile::write);
+  m_file_destroy = TRUE;

   m_o_streambuf->SetBufferIO(1024);
 }
 
   m_o_streambuf->SetBufferIO(1024);
 }
 

+wxFileOutputStream::wxFileOutputStream(wxFile& file)
+{
+  m_file = &file;
+  m_file_destroy = FALSE;
+  m_o_streambuf->SetBufferIO(1024);
+}
+
+wxFileOutputStream::wxFileOutputStream()
+  : wxOutputStream()
+{
+  m_o_streambuf->SetBufferIO(1024);
+  m_file_destroy = FALSE;
+  m_file = NULL;
+}
+

 wxFileOutputStream::~wxFileOutputStream()
 {
 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;
 }
 
   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();
 }
 
 void wxFileOutputStream::Sync()
 {
   wxOutputStream::Sync();

-  wxFile::Flush();
+  m_file->Flush();
+}
+
+size_t wxFileOutputStream::StreamSize() const
+{
+  return m_file->Length();

 }
 
 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------

-

 wxFileStream::wxFileStream(const wxString& fileName)
 wxFileStream::wxFileStream(const wxString& fileName)

-  : wxFile(fileName, read_write)
-{
-}
-
-wxFileStream::~wxFileStream()
+ : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file)

 {
 }
 {
 }