replaced OnCtlColor(7 params) with MSWControlColor(1 param)

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index d649b7479393bedfe21983b3c15fd689e66cbb4f..59e73bd75fe83a267054ff8ba819bb4b3a0c467d 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,7 +11,7 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -21,46 +21,52 @@
 
 #include "wx/socket.h"
 
-class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
+class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
   ~wxSocketOutputStream();
 
-  off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+  wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
     { return -1; }
-  off_t TellO() const
+  wxFileOffset TellO() const
     { return -1; }
 
  protected:
   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_NET wxSocketInputStream : public wxInputStream
 {
  public:
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 
-  off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+  wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
     { return -1; }
-  off_t TellI() const
+  wxFileOffset TellI() const
     { return -1; }
 
  protected:
   wxSocketBase *m_i_socket;
 
   size_t OnSysRead(void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketInputStream)
 };
 
-class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
+class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
                    public wxSocketOutputStream
 {
  public:
   wxSocketStream(wxSocketBase& s);
   ~wxSocketStream();
+
+  DECLARE_NO_COPY_CLASS(wxSocketStream)
 };
 
 #endif