X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e69a1ea87c7798c55254e42d64acc4495abe438e..ba8eb933c4dfce54d2f540c6895b04f6724f401f:/src/common/wfstream.cpp

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index d460dd61ab..a6b287af0c 100644
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -6,10 +6,10 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "wfstream.h"
 #endif
 
@@ -198,7 +198,7 @@ wxFileStream::wxFileStream(const wxString& fileName)
 wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
   : wxInputStream()
 {
-    m_file = new wxFFile(fileName, "rb");
+    m_file = new wxFFile(fileName, _T("rb"));
     m_file_destroy = TRUE;
 }
 
@@ -251,7 +251,7 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 
 off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
-    return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset );
+    return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
 }
 
 off_t wxFFileInputStream::OnSysTell() const
@@ -265,7 +265,7 @@ off_t wxFFileInputStream::OnSysTell() const
 
 wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
 {
-    m_file = new wxFFile(fileName, "w+b");
+    m_file = new wxFFile(fileName, _T("w+b"));
     m_file_destroy = TRUE;
 
     if (!m_file->IsOpened())
@@ -324,7 +324,7 @@ off_t wxFFileOutputStream::OnSysTell() const
 
 off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
-    return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset );
+    return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
 }
 
 void wxFFileOutputStream::Sync()