compilation fix: wxcrt.h, not crt.h

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

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index d69720c31db060a22fdb9a0f4c606b02e04de38b..c9f1b2735e956edc6304c531b5e618809c42c0b2 100644 (file)
--- 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:
 // Purpose:     DDE classes
 // Author:      Julian Smart
 // Modified by:


@@ -29,12 +29,12 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #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"

-#include "wx/hashmap.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -300,7 +300,7 @@ bool wxDDEServer::Create(const wxString& server)
 
 wxDDEServer::~wxDDEServer()
 {
 
 wxDDEServer::~wxDDEServer()
 {

-    if ( !m_serviceName.IsEmpty() )
+    if ( !m_serviceName.empty() )

     {
         HSZ hsz = DDEAtomFromString(m_serviceName);
 
     {
         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,
                                     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,
                                     0,
                                     XTYP_EXECUTE,
                                     DDE_TIMEOUT,


@@ -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"));