unapplied part of Dimitri's patch at his request
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -471,7 +471,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
|
|||||||
data = new char[size];
|
data = new char[size];
|
||||||
sockstrm->Read(data, size);
|
sockstrm->Read(data, size);
|
||||||
|
|
||||||
connection->OnExecute (topic_name, (wxChar *) data, size, format);
|
connection->OnExecute (topic_name, data, size, format);
|
||||||
|
|
||||||
delete [] data;
|
delete [] data;
|
||||||
break;
|
break;
|
||||||
@@ -488,7 +488,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
|
|||||||
data = new char[size];
|
data = new char[size];
|
||||||
sockstrm->Read(data, size);
|
sockstrm->Read(data, size);
|
||||||
|
|
||||||
connection->OnAdvise (topic_name, item, (wxChar *) data, size, format);
|
connection->OnAdvise (topic_name, item, data, size, format);
|
||||||
|
|
||||||
delete [] data;
|
delete [] data;
|
||||||
break;
|
break;
|
||||||
|
@@ -734,7 +734,7 @@ _DDECallback(WORD wType,
|
|||||||
0);
|
0);
|
||||||
DdeFreeDataHandle(hData);
|
DdeFreeDataHandle(hData);
|
||||||
if ( connection->OnExecute(connection->m_topicName,
|
if ( connection->OnExecute(connection->m_topicName,
|
||||||
(wxChar *) connection->m_bufPtr,
|
connection->m_bufPtr,
|
||||||
(int)len,
|
(int)len,
|
||||||
(wxIPCFormat) wFmt) )
|
(wxIPCFormat) wFmt) )
|
||||||
{
|
{
|
||||||
@@ -874,7 +874,7 @@ _DDECallback(WORD wType,
|
|||||||
DdeFreeDataHandle(hData);
|
DdeFreeDataHandle(hData);
|
||||||
if ( connection->OnAdvise(connection->m_topicName,
|
if ( connection->OnAdvise(connection->m_topicName,
|
||||||
item_name,
|
item_name,
|
||||||
(wxChar *) connection->m_bufPtr,
|
connection->m_bufPtr,
|
||||||
(int)len,
|
(int)len,
|
||||||
(wxIPCFormat) wFmt) )
|
(wxIPCFormat) wFmt) )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user