X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d65fd4e93f26ba45540ea15d16a3cbfdc78df23e..51810d4d7e2d0ac1fa1eba43cebff9a4f4a73acc:/include/wx/wfstream.h

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 63c90a0961..da1e7c2d87 100644
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -39,7 +39,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
@@ -69,7 +69,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
@@ -93,8 +93,8 @@ public:
     virtual ~wxTempFileOutputStream();
 
     bool Close() { return Commit(); }
-    virtual bool Commit() { return m_file->Commit(); }
-    virtual void Discard() { m_file->Discard(); }
+    WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); }
+    WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); }
 
     wxFileOffset GetLength() const { return m_file->Length(); }
     bool IsSeekable() const { return true; }
@@ -116,6 +116,7 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
 {
 public:
     wxFileStream(const wxString& fileName);
+    virtual bool IsOk() const;
 
 private:
     DECLARE_NO_COPY_CLASS(wxFileStream)
@@ -132,7 +133,7 @@ private:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:
-    wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb"));
+    wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb");
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     virtual ~wxFFileInputStream();
@@ -140,7 +141,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
@@ -160,7 +161,7 @@ protected:
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:
-    wxFFileOutputStream(const wxString& fileName, const wxChar *mode = _T("w+b"));
+    wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb");
     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();
@@ -170,7 +171,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
@@ -191,7 +192,8 @@ class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
                                        public wxFFileOutputStream
 {
 public:
-    wxFFileStream(const wxString& fileName);
+    wxFFileStream(const wxString& fileName, const wxString& mode = "w+b");
+    virtual bool IsOk() const;
 
 private:
     DECLARE_NO_COPY_CLASS(wxFFileStream)