X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..53c9228ead0c7c0955bdc882fc2ccc9aae8342ba:/include/wx/sckipc.h diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 743da0ab9f..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 @@ -61,13 +61,13 @@ 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); @@ -122,6 +122,11 @@ public: 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