X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/sckipc.h diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index efe0fcd27a..4d4164cd8c 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -49,39 +49,36 @@ * */ -class WXDLLIMPEXP_NET wxTCPServer; -class WXDLLIMPEXP_NET wxTCPClient; +class WXDLLIMPEXP_FWD_NET wxTCPServer; +class WXDLLIMPEXP_FWD_NET wxTCPClient; -class WXDLLIMPEXP_NET wxTCPConnection: public wxConnectionBase +class WXDLLIMPEXP_NET wxTCPConnection : public wxConnectionBase { - DECLARE_DYNAMIC_CLASS(wxTCPConnection) - public: - wxTCPConnection(wxChar *buffer, int size); + wxTCPConnection(void *buffer, size_t size); wxTCPConnection(); virtual ~wxTCPConnection(); - // Calls that CLIENT can make - virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - virtual wxChar *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); - virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - virtual bool StartAdvise(const wxString& item); - virtual bool StopAdvise(const wxString& item); + // To enable the compressor (NOTE: not implemented!) + void Compress(bool on); - // Calls that SERVER can make - virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - // Calls that both can make + // implement base class pure virtual methods + virtual const void *Request(const wxString& item, + size_t *size = NULL, + wxIPCFormat format = wxIPC_TEXT); + virtual bool StartAdvise(const wxString& item); + virtual bool StopAdvise(const wxString& item); virtual bool Disconnect(void); - // Callbacks to BOTH - override at will - // Default behaviour is to delete connection and return true - virtual bool OnDisconnect(void) { delete this; return true; } +protected: + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format); + virtual bool DoPoke(const wxString& item, const void *data, size_t size, + wxIPCFormat format); + virtual bool DoAdvise(const wxString& item, const void *data, size_t size, + wxIPCFormat format); - // To enable the compressor (NOTE: not implemented!) - void Compress(bool on); -protected: wxSocketBase *m_sock; wxSocketStream *m_sockstrm; wxDataInputStream *m_codeci; @@ -92,32 +89,23 @@ protected: friend class wxTCPClient; friend class wxTCPEventHandler; -private: - // - // We're hiding an Execute method in ConnectionBase - // - virtual bool Execute(const wxString& str) - { return Execute(str, -1, wxIPC_TEXT); } - - DECLARE_NO_COPY_CLASS(wxTCPConnection) + DECLARE_NO_COPY_CLASS(wxTCPConnection) + DECLARE_DYNAMIC_CLASS(wxTCPConnection) }; -class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase +class WXDLLIMPEXP_NET wxTCPServer : public wxServerBase { - DECLARE_DYNAMIC_CLASS(wxTCPServer) - public: - wxTCPConnection *topLevelConnection; - wxTCPServer(); virtual ~wxTCPServer(); // Returns false on error (e.g. port number is already in use) virtual bool Create(const wxString& serverName); - // Callbacks to SERVER - override at will virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); + wxTCPConnection *topLevelConnection; + protected: wxSocketServer *m_server; @@ -126,13 +114,12 @@ protected: wxString m_filename; #endif // __UNIX_LIKE__ - DECLARE_NO_COPY_CLASS(wxTCPServer) + DECLARE_NO_COPY_CLASS(wxTCPServer) + DECLARE_DYNAMIC_CLASS(wxTCPServer) }; -class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase +class WXDLLIMPEXP_NET wxTCPClient : public wxClientBase { - DECLARE_DYNAMIC_CLASS(wxTCPClient) - public: wxTCPClient(); virtual ~wxTCPClient(); @@ -146,6 +133,9 @@ public: // Callbacks to CLIENT - override at will virtual wxConnectionBase *OnMakeConnection(); + +private: + DECLARE_DYNAMIC_CLASS(wxTCPClient) }; #endif // wxUSE_SOCKETS && wxUSE_IPC