X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edef87c8274bd4cadcccc4ff107aeb1815e48460..3f4a2351e4c677c88c18ea812b609477adee7380:/src/msw/dde.cpp diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index f33908fc4e..a7465a0dcc 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/dde.cpp +// Name: src/msw/dde.cpp // Purpose: DDE classes // Author: Julian Smart // Modified by: @@ -29,12 +29,12 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" + #include "wx/hashmap.h" + #include "wx/module.h" #endif -#include "wx/module.h" #include "wx/dde.h" #include "wx/intl.h" -#include "wx/hashmap.h" #include "wx/msw/private.h" @@ -96,7 +96,7 @@ static void DDELogError(const wxString& s, UINT error = DMLERR_NO_ERROR); // global variables // ---------------------------------------------------------------------------- -WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap ) +WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap ); static DWORD DDEIdInst = 0L; static wxDDEConnection *DDECurrentlyConnecting = NULL; @@ -300,7 +300,7 @@ bool wxDDEServer::Create(const wxString& server) wxDDEServer::~wxDDEServer() { - if ( !m_serviceName.IsEmpty() ) + if ( !m_serviceName.empty() ) { HSZ hsz = DDEAtomFromString(m_serviceName); @@ -558,7 +558,7 @@ bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat WXUNUSED GetHConv(), NULL, // If the transaction specified by the wType parameter does not pass data or is XTYP_EXECUTE, -// wFmt should be zero. +// wFmt should be zero. 0, XTYP_EXECUTE, DDE_TIMEOUT,