STL-ification patch for wxMSW and wxGTK.

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 6ef70e4e91b0dfdab398189519e3d58fe439271b..0dc11427de96f81dde32e3a7614bdf91b59feaf5 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,7 +11,7 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -21,7 +21,7 @@
 
 #include "wx/socket.h"
 
-class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
+class WXDLLIMPEXP_BASE wxSocketOutputStream : public wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
@@ -36,9 +36,11 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
   wxSocketBase *m_o_socket;
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
 };
 
-class WXDLLEXPORT wxSocketInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxSocketInputStream : public wxInputStream
 {
  public:
   wxSocketInputStream(wxSocketBase& s);
@@ -53,9 +55,11 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
   wxSocketBase *m_i_socket;
 
   size_t OnSysRead(void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketInputStream)
 };
 
-class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
+class WXDLLIMPEXP_BASE wxSocketStream : public wxSocketInputStream,
                    public wxSocketOutputStream
 {
  public: