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

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index daa27c636ca9476e695c615d0d58c556683c823e..3fea37e1ece57ee211fdb76dfeac8efb01cff32b 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -471,7 +471,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
     data = new char[size];
     sockstrm->Read(data, size);
 
     data = new char[size];
     sockstrm->Read(data, size);
 

-    connection->OnExecute (topic_name, (wxChar *) data, size, format);
+    connection->OnExecute (topic_name, data, size, format);

 
     delete [] data;
     break;
 
     delete [] data;
     break;


@@ -488,7 +488,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
     data = new char[size];
     sockstrm->Read(data, size);
     
     data = new char[size];
     sockstrm->Read(data, size);
     

-    connection->OnAdvise (topic_name, item, (wxChar *) data, size, format);
+    connection->OnAdvise (topic_name, item, data, size, format);

 
     delete [] data;
     break;
 
     delete [] data;
     break;

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 327e727944fc77173ca66062a82d975f433418c6..6a7e4d547c09c042250a0b5cfeb58038e96d75ea 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -734,7 +734,7 @@ _DDECallback(WORD wType,
                                            0);
                     DdeFreeDataHandle(hData);
                     if ( connection->OnExecute(connection->m_topicName,
                                            0);
                     DdeFreeDataHandle(hData);
                     if ( connection->OnExecute(connection->m_topicName,

-                                               (wxChar *) connection->m_bufPtr,
+                                               connection->m_bufPtr,

                                                (int)len,
                                                (wxIPCFormat) wFmt) )
                     {
                                                (int)len,
                                                (wxIPCFormat) wFmt) )
                     {


@@ -874,7 +874,7 @@ _DDECallback(WORD wType,
                     DdeFreeDataHandle(hData);
                     if ( connection->OnAdvise(connection->m_topicName,
                                               item_name,
                     DdeFreeDataHandle(hData);
                     if ( connection->OnAdvise(connection->m_topicName,
                                               item_name,

-                                              (wxChar *) connection->m_bufPtr,
+                                              connection->m_bufPtr,

                                               (int)len,
                                               (wxIPCFormat) wFmt) )
                     {
                                               (int)len,
                                               (wxIPCFormat) wFmt) )
                     {