X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32c1cda24418c225fa2cff4b1416f7a3d62c88b1..ec75d791f043b3b43cac9825a2c62e9d5321e616:/include/wx/msw/dde.h?ds=sidebyside diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index ac926b679f..56813e4340 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DDE_H_ @@ -49,14 +49,13 @@ class WXDLLEXPORT wxDDEConnection: public wxConnectionBase { DECLARE_DYNAMIC_CLASS(wxDDEConnection) public: - wxDDEConnection(char *buffer, int size); - wxDDEConnection(void); + wxDDEConnection(wxChar *buffer, int size); // use external buffer + wxDDEConnection(); // use internal buffer ~wxDDEConnection(void); // Calls that CLIENT can make - virtual bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - virtual bool Execute(const wxString& str) { return Execute(WXSTRINGCAST str, -1, wxIPC_TEXT); } - virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); + 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); @@ -67,25 +66,11 @@ public: // Calls that both can make virtual bool Disconnect(void); - // Callbacks to SERVER - override at will - virtual bool OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format) { return FALSE; }; - virtual char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format) { return NULL; }; - virtual bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format) { return FALSE; }; - virtual bool OnStartAdvise(const wxString& topic, const wxString& item) { return FALSE; }; - virtual bool OnStopAdvise(const wxString& topic, const wxString& item) { return FALSE; }; - - // Callbacks to CLIENT - override at will - virtual bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format) { return FALSE; }; - - // Callbacks to BOTH - // Default behaviour is to delete connection and return TRUE virtual bool OnDisconnect(void); public: - char* m_bufPtr; wxString m_topicName; - int m_bufSize; wxDDEServer* m_server; wxDDEClient* m_client;