X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..34db817726d6c239504b26f24996fd3b8a401ebc:/include/wx/protocol/protocol.h diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h index 0e823616e0..bdf1b5760d 100644 --- a/include/wx/protocol/protocol.h +++ b/include/wx/protocol/protocol.h @@ -12,10 +12,6 @@ #ifndef _WX_PROTOCOL_PROTOCOL_H #define _WX_PROTOCOL_PROTOCOL_H -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface -#endif - #include "wx/defs.h" #if wxUSE_PROTOCOL @@ -50,7 +46,7 @@ typedef enum // wxProtocol: abstract base class for all protocols // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxProtocol +class WXDLLIMPEXP_NET wxProtocol #if wxUSE_SOCKETS : public wxSocketClient #else @@ -63,7 +59,8 @@ public: #if wxUSE_SOCKETS bool Reconnect(); virtual bool Connect( const wxString& WXUNUSED(host) ) { return FALSE; } - virtual bool Connect( wxSockAddress& addr, bool WXUNUSED(wait) = TRUE) { return wxSocketClient::Connect(addr); } + virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = TRUE) + { return wxSocketClient::Connect(addr); } // read a '\r\n' terminated line from the given socket and put it in // result (without the terminators) @@ -85,10 +82,6 @@ private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol) }; -#if wxUSE_SOCKETS -wxProtocolError WXDLLIMPEXP_BASE GetLine(wxSocketBase *sock, wxString& result); -#endif - // ---------------------------------------------------------------------------- // macros for protocol classes // ---------------------------------------------------------------------------- @@ -108,7 +101,7 @@ bool wxProtocolUse##class = TRUE; wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \ } wxProtocolDoUse##class; -class WXDLLIMPEXP_BASE wxProtoInfo : public wxObject +class WXDLLIMPEXP_NET wxProtoInfo : public wxObject { public: wxProtoInfo(const wxChar *name,