X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c4728f63395c3641aa62f2b549ee693eb8be978..4f73f25cc81a95cbfff4f1afa850aae5976a423c:/include/wx/sckstrm.h diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h index af1785542e..7018209199 100644 --- a/include/wx/sckstrm.h +++ b/include/wx/sckstrm.h @@ -11,10 +11,6 @@ #ifndef __SCK_STREAM_H__ #define __SCK_STREAM_H__ -#if defined(__GNUG__) && !defined(__APPLE__) -#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: @@ -37,18 +33,18 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream 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); - ~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: @@ -56,7 +52,7 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream size_t OnSysRead(void *buffer, size_t bufsize); - DECLARE_NO_COPY_CLASS(wxSocketInputStream) + wxDECLARE_NO_COPY_CLASS(wxSocketInputStream); }; class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream, @@ -64,9 +60,9 @@ class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream, { public: wxSocketStream(wxSocketBase& s); - ~wxSocketStream(); + virtual ~wxSocketStream(); - DECLARE_NO_COPY_CLASS(wxSocketStream) + wxDECLARE_NO_COPY_CLASS(wxSocketStream); }; #endif