no changes, just remove #if'd out code

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index d544b3abc9044db065356357695a3c6ed79bb282..7018209199b6543666ba25ae52acea2e2851a06a 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -6,15 +6,11 @@
 // Created:     17/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     17/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

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


@@ -25,11 +21,11 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);

-  ~wxSocketOutputStream();
+  virtual ~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() const
+  wxFileOffset TellO() const

     { return -1; }
 
  protected:
     { return -1; }
 
  protected:


@@ -37,18 +33,18 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);
 
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);
 

-    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream);

 };
 
 class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
 {
  public:
   wxSocketInputStream(wxSocketBase& s);
 };
 
 class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
 {
  public:
   wxSocketInputStream(wxSocketBase& s);

-  ~wxSocketInputStream();
+  virtual ~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() const
+  wxFileOffset TellI() const

     { return -1; }
 
  protected:
     { return -1; }
 
  protected:


@@ -56,7 +52,7 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
 
   size_t OnSysRead(void *buffer, size_t bufsize);
 
 
   size_t OnSysRead(void *buffer, size_t bufsize);
 

-    DECLARE_NO_COPY_CLASS(wxSocketInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxSocketInputStream);

 };
 
 class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
 };
 
 class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,


@@ -64,9 +60,9 @@ class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
 {
  public:
   wxSocketStream(wxSocketBase& s);
 {
  public:
   wxSocketStream(wxSocketBase& s);

-  ~wxSocketStream();
+  virtual ~wxSocketStream();

 
 

-  DECLARE_NO_COPY_CLASS(wxSocketStream)
+  wxDECLARE_NO_COPY_CLASS(wxSocketStream);

 };
 
 #endif
 };
 
 #endif