Warning fixes.

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index af90722dd08a861976ba447d718f07e95b059f09..8370eebc6faac3f3332554139f29e37bfcee0aa8 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -20,12 +20,14 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_STREAMS && wxUSE_FILE
+#if wxUSE_STREAMS

 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 
 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 

+#if wxUSE_FILE
+

 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------


@@ -191,22 +193,27 @@ wxFileStream::wxFileStream(const wxString& fileName)
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 

+#endif //wxUSE_FILE
+
+#if wxUSE_FFILE
+

 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------
 

-wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
-  : wxInputStream()
+wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
+                                       const wxChar *mode)
+                  : wxInputStream()

 {
 {

-    m_file = new wxFFile(fileName, _T("rb"));
+    m_file = new wxFFile(fileName, mode);

     m_file_destroy = true;
 }
 
 wxFFileInputStream::wxFFileInputStream()
     m_file_destroy = true;
 }
 
 wxFFileInputStream::wxFFileInputStream()

-  : wxInputStream()
+                  : wxInputStream()

 {
 {

-    m_file_destroy = false;

     m_file = NULL;
     m_file = NULL;

+    m_file_destroy = false;

 }
 
 wxFFileInputStream::wxFFileInputStream(wxFFile& file)
 }
 
 wxFFileInputStream::wxFFileInputStream(wxFFile& file)


@@ -250,14 +257,7 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 
 wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
 
 wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {

-#ifdef __VMS
-#pragma message disable intsignchange
-#endif
-    wxASSERT_MSG( pos >= LONG_MIN && pos <= LONG_MAX, _T("no huge wxFFile support") );
-    return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );
-#ifdef __VMS
-#pragma message enable intsignchange
-#endif
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;

 }
 
 wxFileOffset wxFFileInputStream::OnSysTell() const
 }
 
 wxFileOffset wxFFileInputStream::OnSysTell() const


@@ -269,9 +269,10 @@ wxFileOffset wxFFileInputStream::OnSysTell() const
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 

-wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
+wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
+                                         const wxChar *mode)

 {
 {

-    m_file = new wxFFile(fileName, _T("w+b"));
+    m_file = new wxFFile(fileName, mode);

     m_file_destroy = true;
 
     if (!m_file->IsOpened())
     m_file_destroy = true;
 
     if (!m_file->IsOpened())


@@ -292,10 +293,10 @@ wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
 }
 
 wxFFileOutputStream::wxFFileOutputStream()
 }
 
 wxFFileOutputStream::wxFFileOutputStream()

-  : wxOutputStream()
+                   : wxOutputStream()

 {
 {

-    m_file_destroy = false;

     m_file = NULL;
     m_file = NULL;

+    m_file_destroy = false;

 }
 
 wxFFileOutputStream::wxFFileOutputStream(FILE *file)
 }
 
 wxFFileOutputStream::wxFFileOutputStream(FILE *file)


@@ -331,14 +332,7 @@ wxFileOffset wxFFileOutputStream::OnSysTell() const
 
 wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
 
 wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {

-#ifdef __VMS
-#pragma message disable intsignchange
-#endif
-    wxASSERT_MSG( pos >= LONG_MIN && pos <= LONG_MAX, _T("no huge wxFFile support") );
-    return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );
-#ifdef __VMS
-#pragma message enable intsignchange
-#endif
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;

 }
 
 void wxFFileOutputStream::Sync()
 }
 
 void wxFFileOutputStream::Sync()


@@ -362,6 +356,7 @@ wxFFileStream::wxFFileStream(const wxString& fileName)
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 

-#endif
-  // wxUSE_STREAMS && wxUSE_FILE
+#endif //wxUSE_FFILE
+
+#endif // wxUSE_STREAMS