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

made strings used in wxIPC methods const as a temporary compilation fix (they will need to be also made void* and not wxChar* later) (patch 1759924)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-27 23:59:11 +00:00
parent fc9361e3ec
commit 1e0f0a90e0
12 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ipc/client.cpp
View File

@@ -417,7 +417,7 @@ MyClient::~MyClient()
// ----------------------------------------------------------------------------
void MyConnection::Log(const wxString& command, const wxString& topic,
const wxString& item, wxChar *data, int size, wxIPCFormat format)
const wxString& item, const wxChar *data, int size, wxIPCFormat format)
{
wxString s;
if (topic.IsEmpty() && item.IsEmpty())
@@ -475,7 +475,7 @@ wxChar *MyConnection::Request(const wxString& item, int *size, wxIPCFormat forma
return data;
}
bool MyConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
bool MyConnection::Poke(const wxString& item, const wxChar *data, int size, wxIPCFormat format)
{
Log(_T("Poke"), wxEmptyString, item, data, size, format);
return wxConnection::Poke(item, data, size, format);

4
samples/ipc/client.h
View File

@@ -83,12 +83,12 @@ class MyConnection: public wxConnection
public:
virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual wxChar *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 Poke(const wxString& item, const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual bool OnAdvise(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format);
virtual bool OnDisconnect();
protected:
void Log(const wxString& command, const wxString& topic,
const wxString& item, wxChar *data, int size, wxIPCFormat format);
const wxString& item, const wxChar *data, int size, wxIPCFormat format);
};
class MyClient: public wxClient

18
samples/ipc/server.cpp
View File

@@ -285,9 +285,9 @@ void MyServer::Advise()
if (CanAdvise())
{
wxString s = wxDateTime::Now().Format();
m_connection->Advise(m_connection->m_sAdvise, (wxChar *)s.c_str());
m_connection->Advise(m_connection->m_sAdvise, s.c_str());
s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
m_connection->Advise(m_connection->m_sAdvise, (wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
m_connection->Advise(m_connection->m_sAdvise, s.c_str(), (s.Length() + 1) * sizeof(wxChar));
#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."));
@@ -327,25 +327,25 @@ bool MyConnection::OnPoke(const wxString& topic,
return wxConnection::OnPoke(topic, item, data, size, format);
}
wxChar *MyConnection::OnRequest(const wxString& topic,
const wxChar *MyConnection::OnRequest(const wxString& topic,
const wxString& item, int * size, wxIPCFormat format)
{
wxChar *data;
const wxChar *data;
if (item == _T("Date"))
{
m_sRequestDate = wxDateTime::Now().Format();
data = (wxChar *)m_sRequestDate.c_str();
data = m_sRequestDate.c_str();
*size = -1;
}
else if (item == _T("Date+len"))
{
m_sRequestDate = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
data = (wxChar *)m_sRequestDate.c_str();
data = m_sRequestDate.c_str();
*size = (m_sRequestDate.Length() + 1) * sizeof(wxChar);
}
else if (item == _T("bytes[3]"))
{
data = (wxChar *)m_achRequestBytes;
data = m_achRequestBytes;
m_achRequestBytes[0] = '1'; m_achRequestBytes[1] = '2'; m_achRequestBytes[2] = '3';
*size = 3;
}
@@ -379,7 +379,7 @@ bool MyConnection::OnStopAdvise(const wxString& topic,
}
void MyConnection::Log(const wxString& command, const wxString& topic,
const wxString& item, wxChar *data, int size, wxIPCFormat format)
const wxString& item, const wxChar *data, int size, wxIPCFormat format)
{
wxString s;
if (topic.IsEmpty() && item.IsEmpty())
@@ -407,7 +407,7 @@ void MyConnection::Log(const wxString& command, const wxString& topic,
wxLogMessage(_T("%s[invalid data],%d)"), s.c_str(), size);
}
bool MyConnection::Advise(const wxString& item, wxChar *data, int size, wxIPCFormat format)
bool MyConnection::Advise(const wxString& item, const wxChar *data, int size, wxIPCFormat format)
{
Log(_T("Advise"), _T(""), item, data, size, format);
return wxConnection::Advise(item, data, size, format);

6
samples/ipc/server.h
View File

@@ -70,14 +70,14 @@ public:
~MyConnection();
virtual bool OnExecute(const wxString& topic, wxChar *data, int size, wxIPCFormat format);
virtual wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
virtual const wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
virtual bool OnPoke(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format);
virtual bool OnStartAdvise(const wxString& topic, const wxString& item);
virtual bool OnStopAdvise(const wxString& topic, const wxString& item);
virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual bool Advise(const wxString& item, const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual bool OnDisconnect();
protected:
void Log(const wxString& command, const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format);
void Log(const wxString& command, const wxString& topic, const wxString& item, const wxChar *data, int size, wxIPCFormat format);
public:
wxString m_sAdvise;
protected: