X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/protocol/protocol.h diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h index f1a7780be1..a6012c5c9e 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 WXDLLEXPORT_BASE wxProtocol +class WXDLLIMPEXP_NET wxProtocol #if wxUSE_SOCKETS : public wxSocketClient #else @@ -82,13 +78,9 @@ public: virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {} private: - DECLARE_ABSTRACT_CLASS(wxProtocol) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol) }; -#if wxUSE_SOCKETS -wxProtocolError WXDLLEXPORT_BASE GetLine(wxSocketBase *sock, wxString& result); -#endif - // ---------------------------------------------------------------------------- // macros for protocol classes // ---------------------------------------------------------------------------- @@ -108,7 +100,7 @@ bool wxProtocolUse##class = TRUE; wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \ } wxProtocolDoUse##class; -class WXDLLEXPORT_BASE wxProtoInfo : public wxObject +class WXDLLIMPEXP_NET wxProtoInfo : public wxObject { public: wxProtoInfo(const wxChar *name,