X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..f5abe9111b4f425bc2430111b2b77844e87b2f29:/include/wx/ipcbase.h diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index d4cbe08f04..1ceda4baa2 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -33,7 +33,7 @@ class WXDLLEXPORT wxConnectionBase: public wxObject // Calls that CLIENT can make virtual bool Execute(char *data, int size = -1, wxDataFormat format = wxDF_TEXT ) = 0; virtual bool Execute(const wxString& str) { return Execute((char *)(const char *)str, -1, wxDF_TEXT); } - virtual char *Request(const wxString& item, int *size = NULL, wxDataFormat format = wxDF_TEXT) = 0; + virtual char *Request(const wxString& item, int *size = (int *) NULL, wxDataFormat format = wxDF_TEXT) = 0; virtual bool Poke(const wxString& item, char *data, int size = -1, wxDataFormat format = wxDF_TEXT) = 0; virtual bool StartAdvise(const wxString& item) = 0; virtual bool StopAdvise(const wxString& item) = 0; @@ -48,7 +48,7 @@ class WXDLLEXPORT wxConnectionBase: public wxObject virtual bool OnExecute( const wxString& WXUNUSED(topic), char *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; virtual char *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), - int *WXUNUSED(size), int WXUNUSED(format) ) { return NULL; }; + int *WXUNUSED(size), int WXUNUSED(format) ) { return (char *) NULL; }; virtual bool OnPoke( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; virtual bool OnStartAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) )