fix aui crash related to SF bug 1531361

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 0b4be35d9b0b6c75e9054e5ad99fcd11ba987a40..63c90a0961feb33cd0e1d774bdecd360cf28c817 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -12,13 +12,9 @@
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "wfstream.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

-#if wxUSE_STREAMS && wxUSE_FILE
+#if wxUSE_STREAMS

 
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"


@@ -26,6 +22,8 @@
 #include "wx/file.h"
 #include "wx/ffile.h"
 
 #include "wx/file.h"
 #include "wx/ffile.h"
 

+#if wxUSE_FILE
+

 // ----------------------------------------------------------------------------
 // wxFileStream using wxFile
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileStream using wxFile
 // ----------------------------------------------------------------------------


@@ -36,12 +34,13 @@ public:
     wxFileInputStream(const wxString& ifileName);
     wxFileInputStream(wxFile& file);
     wxFileInputStream(int fd);
     wxFileInputStream(const wxString& ifileName);
     wxFileInputStream(wxFile& file);
     wxFileInputStream(int fd);

-    ~wxFileInputStream();
+    virtual ~wxFileInputStream();

 
     wxFileOffset GetLength() const;
 
 
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
-    bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
+    bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }

 
 protected:
     wxFileInputStream();
 
 protected:
     wxFileInputStream();


@@ -69,8 +68,9 @@ public:
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
-    bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
+    bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }

 
 protected:
     wxFileOutputStream();
 
 protected:
     wxFileOutputStream();


@@ -86,6 +86,31 @@ protected:
     DECLARE_NO_COPY_CLASS(wxFileOutputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFileOutputStream)
 };
 

+class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream
+{
+public:
+    wxTempFileOutputStream(const wxString& fileName);
+    virtual ~wxTempFileOutputStream();
+
+    bool Close() { return Commit(); }
+    virtual bool Commit() { return m_file->Commit(); }
+    virtual void Discard() { m_file->Discard(); }
+
+    wxFileOffset GetLength() const { return m_file->Length(); }
+    bool IsSeekable() const { return true; }
+
+protected:
+    size_t OnSysWrite(const void *buffer, size_t size);
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+        { return m_file->Seek(pos, mode); }
+    wxFileOffset OnSysTell() const { return m_file->Tell(); }
+
+private:
+    wxTempFile *m_file;
+
+    DECLARE_NO_COPY_CLASS(wxTempFileOutputStream)
+};
+

 class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
                                       public wxFileOutputStream
 {
 class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
                                       public wxFileOutputStream
 {


@@ -96,6 +121,10 @@ private:
     DECLARE_NO_COPY_CLASS(wxFileStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFileStream)
 };
 

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

 // ----------------------------------------------------------------------------
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------


@@ -106,12 +135,13 @@ public:
     wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb"));
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb"));
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);

-    ~wxFFileInputStream();
+    virtual ~wxFFileInputStream();

 
     wxFileOffset GetLength() const;
 
 
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
-    bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
+    bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }

 
 protected:
     wxFFileInputStream();
 
 protected:
     wxFFileInputStream();


@@ -139,8 +169,9 @@ public:
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
-    bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
+    bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (wxStreamBase::IsOk() && m_file->IsOpened()); }
+    bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }

 
 protected:
     wxFFileOutputStream();
 
 protected:
     wxFFileOutputStream();


@@ -166,6 +197,8 @@ private:
     DECLARE_NO_COPY_CLASS(wxFFileStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFFileStream)
 };
 

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

 
 #endif // _WX_WXFSTREAM_H__
 
 #endif // _WX_WXFSTREAM_H__