Fixed virtual function hiding problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -63,7 +63,6 @@ public:
|
||||
|
||||
// Calls that CLIENT can make
|
||||
virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
|
||||
virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); }
|
||||
virtual char *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);
|
||||
@@ -75,24 +74,6 @@ 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 wxConnectionBase::OnExecute(topic, data, size, format); };
|
||||
virtual char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format)
|
||||
{ return wxConnectionBase::OnRequest(topic, item, size, format); };
|
||||
virtual bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
|
||||
{ return wxConnectionBase::OnPoke(topic, item, data, size, format); };
|
||||
virtual bool OnStartAdvise(const wxString& topic, const wxString& item)
|
||||
{ return wxConnectionBase::OnStartAdvise(topic, item); };
|
||||
virtual bool OnStopAdvise(const wxString& topic, const wxString& item)
|
||||
{ return wxConnectionBase::OnStopAdvise(topic, item); };
|
||||
|
||||
// Callbacks to CLIENT - override at will
|
||||
virtual bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
|
||||
{ return wxConnectionBase::OnAdvise(topic, item, data, size, format); };
|
||||
|
||||
// Callbacks to BOTH
|
||||
|
||||
// Default behaviour is to delete connection and return TRUE
|
||||
virtual bool OnDisconnect(void) { delete this; return TRUE; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user