X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..f6840be66eb772c08f0cbb43de677509d5d132bb:/include/wx/sckstrm.h?ds=sidebyside diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h index b6a060d298..59e73bd75f 100644 --- 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,15 +21,15 @@ #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: @@ -40,15 +40,15 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream 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: @@ -59,12 +59,14 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream 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