X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f010ad481266d9267f5f4fd0547a9fc891441715..75633395579c4154980ed7cf3042ba0f35936120:/src/msw/dde.cpp

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 0787b6d540..6cf22d6b56 100644
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -191,6 +191,16 @@ extern void wxDDEInitialize()
 
 void wxDDECleanUp()
 {
+    wxDDEClientObjects.DeleteContents(TRUE);
+    wxDDEClientObjects.Clear();
+    wxDDEClientObjects.DeleteContents(FALSE);
+
+    wxDDEServerObjects.DeleteContents(TRUE);
+    wxDDEServerObjects.Clear();
+    wxDDEServerObjects.DeleteContents(FALSE);
+
+    wxAtomTable.Clear();
+
     if ( DDEIdInst != 0 )
     {
         DdeUninitialize(DDEIdInst);
@@ -459,7 +469,7 @@ bool wxDDEClient::DeleteConnection(WXHCONV conv)
 // wxDDEConnection
 // ----------------------------------------------------------------------------
 
-wxDDEConnection::wxDDEConnection(char *buffer, int size)
+wxDDEConnection::wxDDEConnection(wxChar *buffer, int size)
      : wxConnectionBase(buffer, size)
 {
     m_client = NULL;
@@ -530,7 +540,7 @@ bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
     return ok;
 }
 
-char *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
+wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
 {
     DWORD result;
 
@@ -760,7 +770,7 @@ _DDECallback(WORD wType,
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                     int user_size = -1;
-                    char *data = connection->OnRequest(connection->m_topicName,
+                    wxChar *data = connection->OnRequest(connection->m_topicName,
                                                        item_name,
                                                        &user_size,
                                                        (wxIPCFormat) wFmt);