X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdc59bb69e3a363d7bb6c3d97507faf918e1af30..61ecf6d34ffb087e4a02d1c4e29e1f155875eba0:/include/wx/sckipc.h?ds=inline diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 603eef900c..89f216d0fc 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -16,7 +16,7 @@ #ifndef _WX_SCKIPC_H #define _WX_SCKIPC_H -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "sckipc.h" #endif @@ -59,14 +59,15 @@ class WXDLLEXPORT wxTCPClient; class WXDLLEXPORT wxTCPConnection: public wxConnectionBase { DECLARE_DYNAMIC_CLASS(wxTCPConnection) + public: - wxTCPConnection(char *buffer, int size); + wxTCPConnection(wxChar *buffer, int size); wxTCPConnection(); virtual ~wxTCPConnection(); // Calls that CLIENT can make virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - virtual char *Request(const wxString& item, int *size = NULL, 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); @@ -77,18 +78,19 @@ public: // Calls that both can make 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; } - // To enable the compressor + // To enable the compressor (NOTE: not implemented!) void Compress(bool on); protected: - wxSocketBase *m_sock; - wxSocketStream *m_sockstrm; - wxDataInputStream *m_codeci; + wxSocketBase *m_sock; + wxSocketStream *m_sockstrm; + wxDataInputStream *m_codeci; wxDataOutputStream *m_codeco; - wxString m_topic; + wxString m_topic; friend class wxTCPServer; friend class wxTCPClient; @@ -112,9 +114,19 @@ public: wxTCPServer(); virtual ~wxTCPServer(); - // Returns FALSE if can't create server (e.g. port number is already in use) - virtual bool Create(const wxString& server_name); + // 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); + +protected: + wxSocketServer *m_server; + +#ifdef __UNIX_LIKE__ + // the name of the file associated to the Unix domain socket, may be empty + wxString m_filename; +#endif // __UNIX_LIKE__ }; class wxTCPClient: public wxClientBase @@ -126,13 +138,13 @@ public: virtual ~wxTCPClient(); virtual bool ValidHost(const wxString& host); - // Call this to make a connection. - // Returns NULL if cannot. + + // Call this to make a connection. Returns NULL if cannot. virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, const wxString& topic); - // Tailor this to return own connection. + // Callbacks to CLIENT - override at will virtual wxConnectionBase *OnMakeConnection(); };