Better fix

[wxWidgets.git] / include / wx / wfstream.h

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 63c90a0961feb33cd0e1d774bdecd360cf28c817..378ef9fcda90251d8e8db8dd5768f7eade7fc44a 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -39,7 +39,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
     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:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -69,7 +69,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
     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:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -116,6 +116,7 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
 {
 public:
     wxFileStream(const wxString& fileName);
 {
 public:
     wxFileStream(const wxString& fileName);

+    virtual bool IsOk() const;

 
 private:
     DECLARE_NO_COPY_CLASS(wxFileStream)
 
 private:
     DECLARE_NO_COPY_CLASS(wxFileStream)


@@ -132,7 +133,7 @@ private:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:
 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();
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     virtual ~wxFFileInputStream();


@@ -140,7 +141,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
     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:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -160,7 +161,7 @@ protected:
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:

-    wxFFileOutputStream(const wxString& fileName, const wxChar *mode = _T("w+b"));
+    wxFFileOutputStream(const wxString& fileName, const wxString& mode = "w+b");

     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();
     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();


@@ -170,7 +171,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
     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:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -192,6 +193,7 @@ class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
 {
 public:
     wxFFileStream(const wxString& fileName);
 {
 public:
     wxFFileStream(const wxString& fileName);

+    virtual bool IsOk() const;

 
 private:
     DECLARE_NO_COPY_CLASS(wxFFileStream)
 
 private:
     DECLARE_NO_COPY_CLASS(wxFFileStream)