X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0250ba3e5f1b176fa69eb5aa7301069ad3bfcf3..e450aa692b887adbae4350896f6c90ec8e1368e3:/include/wx/wfstream.h

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index fedadfae4a..753e46fed1 100644
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "wfstream.h"
 #endif
 
@@ -30,7 +30,7 @@
 // wxFileStream using wxFile
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileInputStream: public wxInputStream {
+class WXDLLIMPEXP_BASE wxFileInputStream: public wxInputStream {
  public:
   wxFileInputStream(const wxString& ifileName);
   wxFileInputStream(wxFile& file);
@@ -51,9 +51,11 @@ class WXDLLEXPORT wxFileInputStream: public wxInputStream {
  protected:
   wxFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFileInputStream)
 };
 
-class WXDLLEXPORT wxFileOutputStream: public wxOutputStream {
+class WXDLLIMPEXP_BASE wxFileOutputStream: public wxOutputStream {
  public:
   wxFileOutputStream(const wxString& fileName);
   wxFileOutputStream(wxFile& file);
@@ -79,9 +81,11 @@ class WXDLLEXPORT wxFileOutputStream: public wxOutputStream {
  protected:
   wxFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFileOutputStream)
 };
 
-class WXDLLEXPORT wxFileStream: public wxFileInputStream, public wxFileOutputStream {
+class WXDLLIMPEXP_BASE wxFileStream: public wxFileInputStream, public wxFileOutputStream {
  public:
   wxFileStream(const wxString& fileName);
 };
@@ -90,7 +94,7 @@ class WXDLLEXPORT wxFileStream: public wxFileInputStream, public wxFileOutputStr
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFFileInputStream: public wxInputStream {
+class WXDLLIMPEXP_BASE wxFFileInputStream: public wxInputStream {
  public:
   wxFFileInputStream(const wxString& ifileName);
   wxFFileInputStream(wxFFile& file);
@@ -111,9 +115,11 @@ class WXDLLEXPORT wxFFileInputStream: public wxInputStream {
  protected:
   wxFFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFFileInputStream)
 };
 
-class WXDLLEXPORT wxFFileOutputStream: public wxOutputStream {
+class WXDLLIMPEXP_BASE wxFFileOutputStream: public wxOutputStream {
  public:
   wxFFileOutputStream(const wxString& fileName);
   wxFFileOutputStream(wxFFile& file);
@@ -139,9 +145,11 @@ class WXDLLEXPORT wxFFileOutputStream: public wxOutputStream {
  protected:
   wxFFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)
 };
 
-class WXDLLEXPORT wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
+class WXDLLIMPEXP_BASE wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
  public:
   wxFFileStream(const wxString& fileName);
 };