fix overriding OnPoke() too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 64db2d8d5282f9180f68a8d975bda7917ad50509..bbb44a061d209fc3ef03cfbca5cf0fe887438d07 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -436,10 +436,12 @@ bool hvConnection::OnExec(const wxString& WXUNUSED(topic),
 
 bool hvConnection::OnPoke(const wxString& WXUNUSED(topic),
                           const wxString& item,
-                          wxChar *data,
-                          int WXUNUSED(size),
-                          wxIPCFormat WXUNUSED(format))
+                          const void *buf,
+                          size_t size,
+                          wxIPCFormat format)
 {
+    const wxString data = GetTextFromData(buf, size, format);
+
     //    wxLogStatus("Poke command: %s = %s", item.c_str(), data);
     //topic is not tested
 
@@ -486,18 +488,4 @@ bool hvConnection::OnPoke(const wxString& WXUNUSED(topic),
     return true;
 }
 
-wxChar *hvConnection::OnRequest(const wxString& WXUNUSED(topic),
-                                const wxString& WXUNUSED(item),
-                                int * WXUNUSED(size),
-                                wxIPCFormat WXUNUSED(format))
-{
-    return NULL;
-}
-
-bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
-                                 const wxString& WXUNUSED(item))
-{
-    return true;
-}
-
 #endif // #if wxUSE_IPC

diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index 2c789b0fdbb45a07ed5be6d46b158a6a5b24eb4f..2d020e78cb13d9d9be6ffc3b9f57df53687b3da8 100644 (file)
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -68,9 +68,8 @@ public:
     virtual ~hvConnection();
 
     bool OnExec(const wxString& topic, const wxString& data);
-    wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
-    bool OnPoke(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format);
-    bool OnStartAdvise(const wxString& topic, const wxString& item);
+    bool OnPoke(const wxString& topic, const wxString& item,
+                const void *data, size_t size, wxIPCFormat format);
 
 private:
 };