call OnExec() taking wxString argument from OnExecute() by default

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-01-12 21:04:10 +00:00
parent f312f981b5
commit 022a8a5af2
4 changed files with 77 additions and 10 deletions

View File

@@ -127,12 +127,19 @@ public:
// Callbacks to SERVER - override at will
virtual bool OnExecute(const wxString& WXUNUSED(topic),
const void *WXUNUSED(data),
size_t WXUNUSED(size),
wxIPCFormat WXUNUSED(format))
virtual bool OnExec(const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(data))
{ return false; }
// deprecated function kept for backwards compatibility: usually you will
// want to override OnExec() above instead which receives its data in a more
// convenient format
virtual bool OnExecute(const wxString& topic,
const void *data,
size_t size,
wxIPCFormat format)
{ return OnExec(topic, GetTextFromData(data, size, format)); }
virtual const void *OnRequest(const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item),
size_t *size,
@@ -166,6 +173,17 @@ public:
virtual bool OnDisconnect() { delete this; return true; }
// converts from the data and format into a wxString automatically
//
// this function accepts data in all of wxIPC_TEXT, wxIPC_UNICODETEXT, and
// wxIPC_UTF8TEXT formats but asserts if the format is anything else
//
// notice that the size parameter here contains the total size of the data,
// including the terminating '\0' or L'\0'
static
wxString GetTextFromData(const void *data, size_t size, wxIPCFormat format);
// return a buffer at least this size, reallocating buffer if needed
// returns NULL if using an inadequate user buffer which can't be resized
void *GetBufferAtLeast(size_t bytes);
@@ -184,7 +202,7 @@ private:
bool m_deletebufferwhendone;
protected:
bool m_connected;
bool m_connected;
DECLARE_NO_ASSIGN_CLASS(wxConnectionBase)
DECLARE_CLASS(wxConnectionBase)