added TODO list for cross compilation

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 4d798f3c7913893d4a0fe36ef3f03ab0279a8abb..599c2f2fad493e41c3291d6f4b14d2d08a305554 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -15,14 +15,17 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include <stdio.h>
-#include <wx/stream.h>
-#include <wx/wfstream.h>
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
+#if wxUSE_STREAMS && wxUSE_FILE
+
+#include <stdio.h>
+#include "wx/stream.h"
+#include "wx/wfstream.h"
+
 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------
@@ -32,7 +35,6 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName)
 {
   m_file = new wxFile(fileName, wxFile::read);
   m_file_destroy = TRUE;
-  m_i_streambuf->SetBufferIO(1024);
 }
 
 wxFileInputStream::wxFileInputStream()
@@ -42,6 +44,18 @@ wxFileInputStream::wxFileInputStream()
   m_file = NULL;
 }
 
+wxFileInputStream::wxFileInputStream(wxFile& file)
+{
+  m_file = &file;
+  m_file_destroy = FALSE;
+}
+
+wxFileInputStream::wxFileInputStream(int fd)
+{
+  m_file = new wxFile(fd);
+  m_file_destroy = TRUE;
+}
+
 wxFileInputStream::~wxFileInputStream()
 {
   if (m_file_destroy)
@@ -60,7 +74,18 @@ size_t wxFileInputStream::StreamSize() const
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
-  return m_file->Read(buffer, size);
+  off_t ret;
+
+  ret = m_file->Read(buffer, size);
+
+  if (m_file->Eof())
+    m_lasterror = wxStream_EOF;
+  if (ret == wxInvalidOffset) {
+    m_lasterror = wxStream_READ_ERR;
+    ret = 0;
+  } 
+
+  return ret;
 }
 
 off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
@@ -81,24 +106,27 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {
   m_file = new wxFile(fileName, wxFile::write);
   m_file_destroy = TRUE;
-  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(int fd)
+{
+  m_file = new wxFile(fd);
+  m_file_destroy = TRUE;
+}
+
 wxFileOutputStream::~wxFileOutputStream()
 {
   if (m_file_destroy) {
@@ -142,3 +170,7 @@ wxFileStream::wxFileStream(const wxString& fileName)
  : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file)
 {
 }
+
+#endif
+  // wxUSE_STREAMS && wxUSE_FILE
+