fixed typo in library name

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

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index e51425d8b36551d728e8b29a60d9e16c611f0da6..03fdc05daf2504188e0c827e9a30a91ddc089f01 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -46,10 +46,6 @@
 #include <windows.h>
 #include <ddeml.h>
 
-#ifdef __WXWINE__
-#define PCONVCONTEXT CONVCONTEXT*
-#endif
-
 #if defined(__TWIN32__) || defined(__GNUWIN32_OLD__)
     #include "wx/msw/gnuwin32/extra.h"
 #endif
@@ -133,7 +129,7 @@ static wxList wxAtomTable(wxKEY_STRING);
 static wxList wxDDEClientObjects;
 static wxList wxDDEServerObjects;
 
-static bool DDEInitialized = FALSE;
+static bool DDEInitialized = false;
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -146,7 +142,7 @@ class wxDDEModule : public wxModule
 {
 public:
     wxDDEModule() {}
-    bool OnInit() { return TRUE; }
+    bool OnInit() { return true; }
     void OnExit() { wxDDECleanUp(); }
 
 private:
@@ -184,20 +180,20 @@ extern void wxDDEInitialize()
         }
         else
         {
-            DDEInitialized = TRUE;
+            DDEInitialized = true;
         }
     }
 }
 
 void wxDDECleanUp()
 {
-    wxDDEClientObjects.DeleteContents(TRUE);
+    wxDDEClientObjects.DeleteContents(true);
     wxDDEClientObjects.Clear();
-    wxDDEClientObjects.DeleteContents(FALSE);
+    wxDDEClientObjects.DeleteContents(false);
 
-    wxDDEServerObjects.DeleteContents(TRUE);
+    wxDDEServerObjects.DeleteContents(true);
     wxDDEServerObjects.Clear();
-    wxDDEServerObjects.DeleteContents(FALSE);
+    wxDDEServerObjects.DeleteContents(false);
 
     wxAtomTable.Clear();
 
@@ -215,23 +211,23 @@ void wxDDECleanUp()
 // Global find connection
 static wxDDEConnection *DDEFindConnection(HCONV hConv)
 {
-  wxNode *node = wxDDEServerObjects.First();
+  wxNode *node = wxDDEServerObjects.GetFirst();
   wxDDEConnection *found = NULL;
   while (node && !found)
   {
-    wxDDEServer *object = (wxDDEServer *)node->Data();
+    wxDDEServer *object = (wxDDEServer *)node->GetData();
     found = object->FindConnection((WXHCONV) hConv);
-    node = node->Next();
+    node = node->GetNext();
   }
   if (found)
       return found;
 
-  node = wxDDEClientObjects.First();
+  node = wxDDEClientObjects.GetFirst();
   while (node && !found)
   {
-    wxDDEClient *object = (wxDDEClient *)node->Data();
+    wxDDEClient *object = (wxDDEClient *)node->GetData();
     found = object->FindConnection((WXHCONV) hConv);
-    node = node->Next();
+    node = node->GetNext();
   }
   return found;
 }
@@ -239,38 +235,38 @@ static wxDDEConnection *DDEFindConnection(HCONV hConv)
 // Global delete connection
 static void DDEDeleteConnection(HCONV hConv)
 {
-  wxNode *node = wxDDEServerObjects.First();
-  bool found = FALSE;
+  wxNode *node = wxDDEServerObjects.GetFirst();
+  bool found = false;
   while (node && !found)
   {
-    wxDDEServer *object = (wxDDEServer *)node->Data();
+    wxDDEServer *object = (wxDDEServer *)node->GetData();
     found = object->DeleteConnection((WXHCONV) hConv);
-    node = node->Next();
+    node = node->GetNext();
   }
   if (found)
     return;
 
-  node = wxDDEClientObjects.First();
+  node = wxDDEClientObjects.GetFirst();
   while (node && !found)
   {
-    wxDDEClient *object = (wxDDEClient *)node->Data();
+    wxDDEClient *object = (wxDDEClient *)node->GetData();
     found = object->DeleteConnection((WXHCONV) hConv);
-    node = node->Next();
+    node = node->GetNext();
   }
 }
 
 // Find a server from a service name
 static wxDDEServer *DDEFindServer(const wxString& s)
 {
-  wxNode *node = wxDDEServerObjects.First();
+  wxNode *node = wxDDEServerObjects.GetFirst();
   wxDDEServer *found = NULL;
   while (node && !found)
   {
-    wxDDEServer *object = (wxDDEServer *)node->Data();
+    wxDDEServer *object = (wxDDEServer *)node->GetData();
 
     if (object->GetServiceName() == s)
       found = object;
-    else node = node->Next();
+    else node = node->GetNext();
   }
   return found;
 }
@@ -295,10 +291,10 @@ bool wxDDEServer::Create(const wxString& server)
         DDELogError(wxString::Format(_("Failed to register DDE server '%s'"),
                                      server.c_str()));
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 wxDDEServer::~wxDDEServer()
@@ -315,22 +311,22 @@ wxDDEServer::~wxDDEServer()
 
     wxDDEServerObjects.DeleteObject(this);
 
-    wxNode *node = m_connections.First();
+    wxNode *node = m_connections.GetFirst();
     while (node)
     {
-        wxDDEConnection *connection = (wxDDEConnection *)node->Data();
-        wxNode *next = node->Next();
+        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+        wxNode *next = node->GetNext();
         connection->SetConnected(false);
         connection->OnDisconnect(); // May delete the node implicitly
         node = next;
     }
 
     // If any left after this, delete them
-    node = m_connections.First();
+    node = m_connections.GetFirst();
     while (node)
     {
-        wxDDEConnection *connection = (wxDDEConnection *)node->Data();
-        wxNode *next = node->Next();
+        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+        wxNode *next = node->GetNext();
         delete connection;
         node = next;
     }
@@ -343,14 +339,14 @@ wxConnectionBase *wxDDEServer::OnAcceptConnection(const wxString& /* topic */)
 
 wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv)
 {
-    wxNode *node = m_connections.First();
+    wxNode *node = m_connections.GetFirst();
     wxDDEConnection *found = NULL;
     while (node && !found)
     {
-        wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
         if (connection->m_hConv == conv)
             found = connection;
-        else node = node->Next();
+        else node = node->GetNext();
     }
     return found;
 }
@@ -358,17 +354,17 @@ wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv)
 // Only delete the entry in the map, not the actual connection
 bool wxDDEServer::DeleteConnection(WXHCONV conv)
 {
-    wxNode *node = m_connections.First();
-    bool found = FALSE;
+    wxNode *node = m_connections.GetFirst();
+    bool found = false;
     while (node && !found)
     {
-        wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
         if (connection->m_hConv == conv)
         {
-            found = TRUE;
+            found = true;
             delete node;
         }
-        else node = node->Next();
+        else node = node->GetNext();
     }
     return found;
 }
@@ -387,18 +383,18 @@ wxDDEClient::wxDDEClient()
 wxDDEClient::~wxDDEClient()
 {
     wxDDEClientObjects.DeleteObject(this);
-    wxNode *node = m_connections.First();
+    wxNode *node = m_connections.GetFirst();
     while (node)
     {
-        wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
         delete connection;  // Deletes the node implicitly (see ~wxDDEConnection)
-        node = m_connections.First();
+        node = m_connections.GetFirst();
     }
 }
 
 bool wxDDEClient::ValidHost(const wxString& /* host */)
 {
-    return TRUE;
+    return true;
 }
 
 wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
@@ -435,14 +431,14 @@ wxConnectionBase *wxDDEClient::OnMakeConnection()
 
 wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv)
 {
-    wxNode *node = m_connections.First();
+    wxNode *node = m_connections.GetFirst();
     wxDDEConnection *found = NULL;
     while (node && !found)
     {
-        wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
         if (connection->m_hConv == conv)
             found = connection;
-        else node = node->Next();
+        else node = node->GetNext();
     }
     return found;
 }
@@ -450,17 +446,17 @@ wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv)
 // Only delete the entry in the map, not the actual connection
 bool wxDDEClient::DeleteConnection(WXHCONV conv)
 {
-    wxNode *node = m_connections.First();
-    bool found = FALSE;
+    wxNode *node = m_connections.GetFirst();
+    bool found = false;
     while (node && !found)
     {
-        wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
         if (connection->m_hConv == conv)
         {
-            found = TRUE;
+            found = true;
             delete node;
         }
-        else node = node->Next();
+        else node = node->GetNext();
     }
     return found;
 }
@@ -469,7 +465,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;
@@ -540,7 +536,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;
 
@@ -664,7 +660,7 @@ bool wxDDEConnection::Advise(const wxString& item,
 bool wxDDEConnection::OnDisconnect()
 {
     delete this;
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -701,7 +697,7 @@ _DDECallback(WORD wType,
                         connection->m_hConv = 0;
                         connection->m_topicName = topic;
                         DDECurrentlyConnecting = connection;
-                        return (DDERETURN)(DWORD)TRUE;
+                        return (DDERETURN)(DWORD)true;
                     }
                 }
                 break;
@@ -713,7 +709,7 @@ _DDECallback(WORD wType,
                 {
                     DDECurrentlyConnecting->m_hConv = (WXHCONV) hConv;
                     DDECurrentlyConnecting = NULL;
-                    return (DDERETURN)(DWORD)TRUE;
+                    return (DDERETURN)(DWORD)true;
                 }
                 break;
             }
@@ -727,7 +723,7 @@ _DDECallback(WORD wType,
                     if (connection->OnDisconnect())
                     {
                         DDEDeleteConnection(hConv);  // Delete mapping: hConv => connection
-                        return (DDERETURN)(DWORD)TRUE;
+                        return (DDERETURN)(DWORD)true;
                     }
                 }
                 break;
@@ -770,7 +766,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);
@@ -929,11 +925,11 @@ static HSZ DDEGetAtom(const wxString& string)
 {
     wxNode *node = wxAtomTable.Find(string);
     if (node)
-        return (HSZ)node->Data();
+        return (HSZ)node->GetData();
     else
     {
         DDEAddAtom(string);
-        return (HSZ)(wxAtomTable.Find(string)->Data());
+        return (HSZ)(wxAtomTable.Find(string)->GetData());
     }
 }