wxTheApp can't be assigned to, anyhow, so make ms_appInstance private and provide...

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 33217d75b5fc64dad716a2a5016a1f7a6f2f3b2c..9778a6cda92316908061aa11d2f15cdd9481e696 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "wfstream.h"
 #endif
 
 #pragma interface "wfstream.h"
 #endif
 


@@ -24,8 +24,13 @@
 #include "wx/string.h"
 #include "wx/stream.h"
 #include "wx/file.h"
 #include "wx/string.h"
 #include "wx/stream.h"
 #include "wx/file.h"

+#include "wx/ffile.h"

 
 

-class wxFileInputStream: public wxInputStream {
+// ----------------------------------------------------------------------------
+// wxFileStream using wxFile
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxFileInputStream: public wxInputStream {

  public:
   wxFileInputStream(const wxString& ifileName);
   wxFileInputStream(wxFile& file);
  public:
   wxFileInputStream(const wxString& ifileName);
   wxFileInputStream(wxFile& file);


@@ -46,9 +51,11 @@ class wxFileInputStream: public wxInputStream {
  protected:
   wxFile *m_file;
   bool m_file_destroy;
  protected:
   wxFile *m_file;
   bool m_file_destroy;

+
+    DECLARE_NO_COPY_CLASS(wxFileInputStream)

 };
 
 };
 

-class wxFileOutputStream: public wxOutputStream {
+class WXDLLIMPEXP_BASE wxFileOutputStream: public wxOutputStream {

  public:
   wxFileOutputStream(const wxString& fileName);
   wxFileOutputStream(wxFile& file);
  public:
   wxFileOutputStream(const wxString& fileName);
   wxFileOutputStream(wxFile& file);


@@ -74,11 +81,87 @@ class wxFileOutputStream: public wxOutputStream {
  protected:
   wxFile *m_file;
   bool m_file_destroy;
  protected:
   wxFile *m_file;
   bool m_file_destroy;

+
+    DECLARE_NO_COPY_CLASS(wxFileOutputStream)

 };
 
 };
 

-class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
+class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
+                                      public wxFileOutputStream
+{
+public:
+    wxFileStream(const wxString& fileName);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxFileStream)
+};
+
+// ----------------------------------------------------------------------------
+// wxFFileStream using wxFFile
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxFFileInputStream: public wxInputStream {

  public:
  public:

-  wxFileStream(const wxString& fileName);
+  wxFFileInputStream(const wxString& ifileName);
+  wxFFileInputStream(wxFFile& file);
+  wxFFileInputStream(FILE *file);
+  ~wxFFileInputStream();
+
+  size_t GetSize() const;
+
+  bool Ok() const { return m_file->IsOpened(); }
+
+ protected:
+  wxFFileInputStream();
+
+  size_t OnSysRead(void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
+
+ protected:
+  wxFFile *m_file;
+  bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFFileInputStream)
+};
+
+class WXDLLIMPEXP_BASE wxFFileOutputStream: public wxOutputStream {
+ public:
+  wxFFileOutputStream(const wxString& fileName);
+  wxFFileOutputStream(wxFFile& file);
+  wxFFileOutputStream(FILE *file);
+  virtual ~wxFFileOutputStream();
+
+  // To solve an ambiguity on GCC
+//  inline wxOutputStream& Write(const void *buffer, size_t size)
+//     { return wxOutputStream::Write(buffer, size); }
+
+  void Sync();
+  size_t GetSize() const;
+
+  bool Ok() const { return m_file->IsOpened(); }
+
+ protected:
+  wxFFileOutputStream();
+
+  size_t OnSysWrite(const void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
+
+ protected:
+  wxFFile *m_file;
+  bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)
+};
+
+class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
+                                       public wxFFileOutputStream
+{
+public:
+    wxFFileStream(const wxString& fileName);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxFFileStream)

 };
 
 #endif
 };
 
 #endif


@@ -87,3 +170,10 @@ class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
 #endif
   // _WX_WXFSTREAM_H__
 
 #endif
   // _WX_WXFSTREAM_H__
 

+
+
+
+
+
+
+