Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log Unicode data correctly, extract the logging code in MyConnectionBase class instead of quadriplicating it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-10 23:43:39 +00:00
parent b81885a6b6
commit 521d34369b
6 changed files with 22 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
samples/ipc/baseserver.cpp
View File

@@ -33,6 +33,8 @@
// we're using TCP/IP or real DDE.
#include "ipcsetup.h"
#include "connection.h"
#include "wx/timer.h"
#include "wx/datetime.h"
@@ -42,7 +44,6 @@
// Define a new application
class MyServer;
class MyConnection;
class MyApp : public wxApp
{
@@ -56,12 +57,9 @@ protected:
DECLARE_APP(MyApp)
class MyConnection : public wxConnection, public wxTimer
class MyConnection : public MyConnectionBase, public wxTimer
{
public:
MyConnection();
virtual ~MyConnection();
virtual bool Disconnect() { return wxConnection::Disconnect(); }
virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format);
virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format);
@@ -72,10 +70,6 @@ public:
virtual bool OnDisconnect();
virtual void Notify();
protected:
void Log(const wxString& command, const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format);
public:
wxString m_sAdvise;
protected:
@@ -182,14 +176,6 @@ void MyServer::Disconnect()
// MyConnection
// ----------------------------------------------------------------------------
MyConnection::MyConnection()
{
}
MyConnection::~MyConnection()
{
}
bool MyConnection::OnExecute(const wxString& topic,
const void *data, size_t size, wxIPCFormat format)
{
@@ -275,47 +261,6 @@ void MyConnection::Notify()
}
}
void MyConnection::Log(const wxString& command, const wxString& topic,
const wxString& item, const void *data, size_t size, wxIPCFormat format)
{
wxString s;
if (topic.IsEmpty() && item.IsEmpty())
s.Printf(_T("%s("), command.c_str());
else if (topic.IsEmpty())
s.Printf(_T("%s(\"%s\","), command.c_str(), item.c_str());
else if (item.IsEmpty())
s.Printf(_T("%s(\"%s\","), command.c_str(), topic.c_str());
else
s.Printf(_T("%s(\"%s\",\"%s\","), command.c_str(), topic.c_str(), item.c_str());
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;
wxLogMessage(_T("%s'%c%c%c',%d)"), s.c_str(), bytes[0], bytes[1], bytes[2], size);
}
else
wxLogMessage(_T("%s...,%d)"), s.c_str(), size);
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::DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format)
{
Log(_T("Advise"), _T(""), item, data, size, format);