fix watcom 64 bug (openwatcom1.1) (second try)

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index fedadfae4ad23e92df81805bfc8a10ac5fe65129..a0cb69e11e7d75f813da0053b5f8bfa3edb22f36 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(NO_GCC_PRAGMA)

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


@@ -30,7 +30,7 @@
 // wxFileStream using wxFile
 // ----------------------------------------------------------------------------
 
 // wxFileStream using wxFile
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileInputStream: public wxInputStream {
+class WXDLLIMPEXP_BASE wxFileInputStream: public wxInputStream {

  public:
   wxFileInputStream(const wxString& ifileName);
   wxFileInputStream(wxFile& file);
  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;
  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);
  public:
   wxFileOutputStream(const wxString& fileName);
   wxFileOutputStream(wxFile& file);


@@ -79,18 +81,25 @@ class WXDLLEXPORT 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 WXDLLEXPORT wxFileStream: public wxFileInputStream, public wxFileOutputStream {
- public:
-  wxFileStream(const wxString& fileName);
+class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
+                                      public wxFileOutputStream
+{
+public:
+    wxFileStream(const wxString& fileName);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxFileStream)

 };
 
 // ----------------------------------------------------------------------------
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFFileInputStream: public wxInputStream {
+class WXDLLIMPEXP_BASE wxFFileInputStream: public wxInputStream {

  public:
   wxFFileInputStream(const wxString& ifileName);
   wxFFileInputStream(wxFFile& file);
  public:
   wxFFileInputStream(const wxString& ifileName);
   wxFFileInputStream(wxFFile& file);


@@ -111,9 +120,11 @@ class WXDLLEXPORT wxFFileInputStream: public wxInputStream {
  protected:
   wxFFile *m_file;
   bool m_file_destroy;
  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);
  public:
   wxFFileOutputStream(const wxString& fileName);
   wxFFileOutputStream(wxFFile& file);


@@ -139,12 +150,20 @@ class WXDLLEXPORT wxFFileOutputStream: public wxOutputStream {
  protected:
   wxFFile *m_file;
   bool m_file_destroy;
  protected:
   wxFFile *m_file;
   bool m_file_destroy;

+
+    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)

 };
 
 };
 

-class WXDLLEXPORT wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
- public:
-  wxFFileStream(const wxString& fileName);
+class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
+                                       public wxFFileOutputStream
+{
+public:
+    wxFFileStream(const wxString& fileName);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxFFileStream)

 };
 };

+

 #endif
   // wxUSE_STREAMS && wxUSE_FILE
 
 #endif
   // wxUSE_STREAMS && wxUSE_FILE