X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d2f3c71d83c52fc4db6c8041de533562816b1d6..c0d6c58bd0d7d6b7dae707b2a78c7f917f98da77:/include/wx/ipcbase.h diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index e2b849b7a1..354bce5f7e 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -53,8 +53,8 @@ class WXDLLEXPORT wxConnectionBase: public wxObject inline ~wxConnectionBase(void) {} // Calls that CLIENT can make - virtual bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0; - virtual bool Execute(const wxString& str) { return Execute(WXSTRINGCAST str, -1, wxIPC_TEXT); } + virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0; + virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); } virtual char *Request(const wxString& item, int *size = (int *) NULL, wxIPCFormat format = wxIPC_TEXT) = 0; virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT) = 0; virtual bool StartAdvise(const wxString& item) = 0; @@ -69,8 +69,8 @@ class WXDLLEXPORT wxConnectionBase: public wxObject // Callbacks to SERVER - override at will virtual bool OnExecute( const wxString& WXUNUSED(topic), char *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; - virtual wxChar *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), - int *WXUNUSED(size), int WXUNUSED(format) ) { return (wxChar *) NULL; }; + virtual char *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), + int *WXUNUSED(size), int WXUNUSED(format) ) { return (char *) NULL; }; virtual bool OnPoke( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; virtual bool OnStartAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) @@ -79,7 +79,7 @@ class WXDLLEXPORT wxConnectionBase: public wxObject { return FALSE; }; // Callbacks to CLIENT - override at will - virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), + virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; // Callbacks to BOTH