reverted wxSocket changes of rev 48723 as they broke linking under non-Unix systems

[wxWidgets.git] / src / msw / dde.cpp

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 547f67b7670c3a20252ffbc5e48322390273978b..158032342083a40a501f15f6f9c1a76d13a35bae 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -30,9 +30,9 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/hashmap.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/hashmap.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"

 #include "wx/dde.h"
 #include "wx/intl.h"
 
 #include "wx/dde.h"
 #include "wx/intl.h"
 


@@ -606,7 +606,7 @@ wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat fo
     return data;
 }
 
     return data;
 }
 

-bool wxDDEConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
+bool wxDDEConnection::Poke(const wxString& item, const wxChar *data, int size, wxIPCFormat format)

 {
     DWORD result;
     if (size < 0)
 {
     DWORD result;
     if (size < 0)


@@ -670,7 +670,7 @@ bool wxDDEConnection::StopAdvise(const wxString& item)
 
 // Calls that SERVER can make
 bool wxDDEConnection::Advise(const wxString& item,
 
 // Calls that SERVER can make
 bool wxDDEConnection::Advise(const wxString& item,

-                             wxChar *data,
+                             const wxChar *data,

                              int size,
                              wxIPCFormat format)
 {
                              int size,
                              wxIPCFormat format)
 {


@@ -805,10 +805,10 @@ _DDECallback(WORD wType,
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                     int user_size = -1;
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                     int user_size = -1;

-                    wxChar *data = connection->OnRequest(connection->m_topicName,
-                                                       item_name,
-                                                       &user_size,
-                                                       (wxIPCFormat) wFmt);
+                    const wxChar *data = connection->OnRequest(connection->m_topicName,
+                                                               item_name,
+                                                               &user_size,
+                                                               (wxIPCFormat)wFmt);

                     if (data)
                     {
                         if (user_size < 0)
                     if (data)
                     {
                         if (user_size < 0)


@@ -978,7 +978,7 @@ static HSZ DDEAtomFromString(const wxString& s)
 {
     wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
 
 {
     wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
 

-    HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*) s.c_str(), DDE_CP);
+    HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*)s.wx_str(), DDE_CP);

     if ( !hsz )
     {
         DDELogError(_("Failed to create DDE string"));
     if ( !hsz )
     {
         DDELogError(_("Failed to create DDE string"));