Fix linking problems with MSVC 5.

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 49fd49d00a8b3d92ebc95bc150391dbbe73448d1..de639c62622f2f70e36c23e6f80fa2181a8c01cf 100644 (file)
--- 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 wxFileInputStream: public wxInputStream {
+class WXDLLEXPORT wxFileInputStream: public wxInputStream {
  public:
   wxFileInputStream(const wxString& ifileName);
   wxFileInputStream(wxFile& file);
@@ -51,9 +51,11 @@ class wxFileInputStream: public wxInputStream {
  protected:
   wxFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFileInputStream)
 };
 
-class wxFileOutputStream: public wxOutputStream {
+class WXDLLEXPORT wxFileOutputStream: public wxOutputStream {
  public:
   wxFileOutputStream(const wxString& fileName);
   wxFileOutputStream(wxFile& file);
@@ -79,9 +81,11 @@ class wxFileOutputStream: public wxOutputStream {
  protected:
   wxFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFileOutputStream)
 };
 
-class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
+class WXDLLEXPORT wxFileStream: public wxFileInputStream, public wxFileOutputStream {
  public:
   wxFileStream(const wxString& fileName);
 };
@@ -90,7 +94,7 @@ class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------
 
-class wxFFileInputStream: public wxInputStream {
+class WXDLLEXPORT wxFFileInputStream: public wxInputStream {
  public:
   wxFFileInputStream(const wxString& ifileName);
   wxFFileInputStream(wxFFile& file);
@@ -111,9 +115,11 @@ class wxFFileInputStream: public wxInputStream {
  protected:
   wxFFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFFileInputStream)
 };
 
-class wxFFileOutputStream: public wxOutputStream {
+class WXDLLEXPORT wxFFileOutputStream: public wxOutputStream {
  public:
   wxFFileOutputStream(const wxString& fileName);
   wxFFileOutputStream(wxFFile& file);
@@ -139,9 +145,11 @@ class wxFFileOutputStream: public wxOutputStream {
  protected:
   wxFFile *m_file;
   bool m_file_destroy;
+
+    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)
 };
 
-class wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
+class WXDLLEXPORT wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
  public:
   wxFFileStream(const wxString& fileName);
 };
@@ -151,3 +159,10 @@ class wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
 #endif
   // _WX_WXFSTREAM_H__
 
+
+
+
+
+
+
+