unifying CFTypes

[wxWidgets.git] / samples / ipc / server.cpp

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 11b50b40538d95403ebc637c2c4096127c9fccaf..691798278f4f25eb75a6e90f68fe3afed239d2b9 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -285,18 +285,18 @@ void MyServer::Advise()
     if (CanAdvise())
     {
         wxString s = wxDateTime::Now().Format();
-        m_connection->Advise(m_connection->m_sAdvise, s.c_str());
+        m_connection->Advise(m_connection->m_sAdvise, s);
         s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
-        m_connection->Advise(m_connection->m_sAdvise, s.c_str(), (s.Length() + 1) * sizeof(wxChar));
+        m_connection->Advise(m_connection->m_sAdvise, (const char *)s.c_str(), s.Length() + 1);
 
 #if wxUSE_DDE_FOR_IPC
         wxLogMessage(_T("DDE Advise type argument cannot be wxIPC_PRIVATE. The client will receive it as wxIPC_TEXT, and receive the correct no of bytes, but not print a correct log entry."));
 #endif
         char bytes[3];
         bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
-        m_connection->Advise(m_connection->m_sAdvise, (wxChar *)bytes, 3, wxIPC_PRIVATE);
+        m_connection->Advise(m_connection->m_sAdvise, bytes, 3, wxIPC_PRIVATE);
         // this works, but the log treats it as a string now
-//        m_connection->Advise(m_connection->m_sAdvise, (wxChar *)bytes, 3, wxIPC_TEXT );
+//        m_connection->Advise(m_connection->m_sAdvise, bytes, 3, wxIPC_TEXT );
     }
 }
 
@@ -314,34 +314,34 @@ MyConnection::~MyConnection()
 }
 
 bool MyConnection::OnExecute(const wxString& topic,
-    wxChar *data, int size, wxIPCFormat format)
+    const void *data, size_t size, wxIPCFormat format)
 {
     Log(_T("OnExecute"), topic, _T(""), data, size, format);
     return true;
 }
 
 bool MyConnection::OnPoke(const wxString& topic,
-    const wxString& item, wxChar *data, int size, wxIPCFormat format)
+    const wxString& item, const void *data, size_t size, wxIPCFormat format)
 {
     Log(_T("OnPoke"), topic, item, data, size, format);
     return wxConnection::OnPoke(topic, item, data, size, format);
 }
 
-const wxChar *MyConnection::OnRequest(const wxString& topic,
-    const wxString& item, int * size, wxIPCFormat format)
+const void *MyConnection::OnRequest(const wxString& topic,
+    const wxString& item, size_t *size, wxIPCFormat format)
 {
-    const wxChar *data;
+    const void *data;
     if (item == _T("Date"))
     {
         m_sRequestDate = wxDateTime::Now().Format();
         data = m_sRequestDate.c_str();
-        *size = -1;
+        *size = wxNO_LEN;
     }    
     else if (item == _T("Date+len"))
     {
         m_sRequestDate = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
         data = m_sRequestDate.c_str();
-        *size = (m_sRequestDate.Length() + 1) * sizeof(wxChar);
+        *size = m_sRequestDate.Length() + 1;
     }    
     else if (item == _T("bytes[3]"))
     {
@@ -354,7 +354,7 @@ const wxChar *MyConnection::OnRequest(const wxString& topic,
         data = NULL;
         *size = 0;
     }
-     Log(_T("OnRequest"), topic, item, data, *size, format);
+    Log(_T("OnRequest"), topic, item, data, *size, format);
     return data;
 }
 
@@ -379,7 +379,7 @@ bool MyConnection::OnStopAdvise(const wxString& topic,
 }
 
 void MyConnection::Log(const wxString& command, const wxString& topic,
-    const wxString& item, const wxChar *data, int size, wxIPCFormat format)
+    const wxString& item, const void *data, size_t size, wxIPCFormat format)
 {
     wxString s;
     if (topic.IsEmpty() && item.IsEmpty())
@@ -391,10 +391,17 @@ void MyConnection::Log(const wxString& command, const wxString& topic,
     else
         s.Printf(_T("%s(\"%s\",\"%s\","), command.c_str(), topic.c_str(), item.c_str());
 
-    if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT) 
-        wxLogMessage(_T("%s\"%s\",%d)"), s.c_str(), data, size);
-    else if (format == wxIPC_PRIVATE)
+    switch (format)
     {
+      case wxIPC_TEXT:
+      case wxIPC_UTF8TEXT:
+#if !wxUSE_UNICODE || wxUSE_UNICODE_UTF8
+        wxLogMessage(_T("%s\"%s\",%d)"), s.c_str(), data, size);
+#else
+        wxLogMessage(_T("%s\"%s\",%d)"), s.c_str(), wxConvUTF8.cMB2WC((const char*)data), size);
+#endif
+        break;
+      case wxIPC_PRIVATE:
         if (size == 3)
         {
             char *bytes = (char *)data;
@@ -402,15 +409,20 @@ void MyConnection::Log(const wxString& command, const wxString& topic,
         }
         else
             wxLogMessage(_T("%s...,%d)"), s.c_str(), size);
-    }
-    else if (format == wxIPC_INVALID) 
+        break;
+      case wxIPC_INVALID:
         wxLogMessage(_T("%s[invalid data],%d)"), s.c_str(), size);
+        break;
+      default:
+        wxLogMessage(_T("%s[unknown data],%d)"), s.c_str(), size);
+        break;
+    }
 }
 
-bool MyConnection::Advise(const wxString& item, const wxChar *data, int size, wxIPCFormat format)
+bool MyConnection::DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format)
 {
     Log(_T("Advise"), _T(""), item, data, size, format);
-    return wxConnection::Advise(item, data, size, format);
+    return wxConnection::DoAdvise(item, data, size, format);
 }
 
 bool MyConnection::OnDisconnect()