refactor wxStaticText::Ellipsize so it's a static public utility function; document...

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index d544b3abc9044db065356357695a3c6ed79bb282..60fced8eb222c4fcd23ce43efebdf2236a49ffc2 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)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #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
@@ -25,11 +21,11 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
 {
  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; }
-  off_t TellO() const
+  wxFileOffset TellO() const
     { return -1; }
 
  protected:
@@ -44,11 +40,11 @@ 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; }
-  off_t TellI() const
+  wxFileOffset TellI() const
     { return -1; }
 
  protected:
@@ -64,7 +60,7 @@ class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
 {
  public:
   wxSocketStream(wxSocketBase& s);
-  ~wxSocketStream();
+  virtual ~wxSocketStream();
 
   DECLARE_NO_COPY_CLASS(wxSocketStream)
 };