From 85ac091e8f73699af40dff1f26f53fafd5d95178 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Thu, 6 Jan 2000 19:05:02 +0000 Subject: [PATCH] Fixed virtual function hiding problem git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/ipcbase.h | 42 +++++++++++++++++++++++++++++++----------- include/wx/msw/dde.h | 13 ------------- include/wx/sckipc.h | 19 ------------------- 3 files changed, 31 insertions(+), 43 deletions(-) diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index f4531f16f8..178cb3b31f 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -67,20 +67,40 @@ class WXDLLEXPORT wxConnectionBase: public wxObject virtual bool Disconnect(void) = 0; // 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 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) ) - { return FALSE; }; - virtual bool OnStopAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) + virtual bool OnExecute ( const wxString& WXUNUSED(topic), + char *WXUNUSED(data), + int WXUNUSED(size), + wxIPCFormat WXUNUSED(format) ) + { return FALSE; }; + + virtual char *OnRequest ( const wxString& WXUNUSED(topic), + const wxString& WXUNUSED(item), + int *WXUNUSED(size), + wxIPCFormat WXUNUSED(format) ) + { return (char *) NULL; }; + + virtual bool OnPoke ( const wxString& WXUNUSED(topic), + const wxString& WXUNUSED(item), + wxChar *WXUNUSED(data), + int WXUNUSED(size), + wxIPCFormat WXUNUSED(format) ) + { return FALSE; }; + + virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic), + const wxString& WXUNUSED(item) ) + { return FALSE; }; + + virtual bool OnStopAdvise ( const wxString& WXUNUSED(topic), + const wxString& WXUNUSED(item) ) { return FALSE; }; // Callbacks to CLIENT - override at will - virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data), - int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; + virtual bool OnAdvise ( const wxString& WXUNUSED(topic), + const wxString& WXUNUSED(item), + char *WXUNUSED(data), + int WXUNUSED(size), + wxIPCFormat WXUNUSED(format) ) + { return FALSE; }; // Callbacks to BOTH diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index f04f5cc58a..8a2062753a 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -55,7 +55,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); @@ -67,18 +66,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 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); diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 939283e940..6f5e695f02 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -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; } -- 2.45.2