fix printf() argument type in GetOsInfo()

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index a330bb173fc8069a0a14f7b00740bac547639aa9..30d01307579eff00b8fde56afb4fb00dfd4f88a4 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,56 +11,58 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/stream.h"
 
 #if wxUSE_SOCKETS && wxUSE_STREAMS
 
 #include "wx/socket.h"
 
 #include "wx/stream.h"
 
 #if wxUSE_SOCKETS && wxUSE_STREAMS
 
 #include "wx/socket.h"
 

-class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
+class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream

 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
   ~wxSocketOutputStream();
 
 {
  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; }
     { return -1; }

-  off_t TellO() 
+  wxFileOffset TellO() const

     { return -1; }
 
  protected:
   wxSocketBase *m_o_socket;
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);
     { 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();
 
 {
  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; }
     { return -1; }

-  off_t TellI() 
+  wxFileOffset TellI() const

     { return -1; }
 
  protected:
   wxSocketBase *m_i_socket;
 
   size_t OnSysRead(void *buffer, size_t bufsize);
     { 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,
-                                  public wxSocketOutputStream
+class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
+                   public wxSocketOutputStream

 {
  public:
   wxSocketStream(wxSocketBase& s);
   ~wxSocketStream();
 {
  public:
   wxSocketStream(wxSocketBase& s);
   ~wxSocketStream();

+
+  DECLARE_NO_COPY_CLASS(wxSocketStream)

 };
 
 #endif
 };
 
 #endif