1. more (minor) wxCaret bug fixes

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

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 8ee90711604289f4bee751057018a444f4a9af37..d8fe4dfa5a7c7abe35a34fe58c2a8fa9c26c126d 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -31,17 +31,19 @@
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"
 #endif
 

-#include "wx/msw/private.h"
+#include "wx/module.h"

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

+#include "wx/msw/private.h"
+#include <windows.h>
+#include <ddeml.h>
+

 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
 

-#include <windows.h>
-#include <ddeml.h>

 #include <string.h>
 
 #ifdef __WIN32__
 #include <string.h>
 
 #ifdef __WIN32__


@@ -120,6 +122,21 @@ void wxDDECleanUp()
     delete [] DDEDefaultIPCBuffer ;
 }
 
     delete [] DDEDefaultIPCBuffer ;
 }
 

+// A module to allow DDE initialization/cleanup
+// without calling these functions from app.cpp or from
+// the user's application.
+
+class wxDDEModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxDDEModule)
+public:
+    wxDDEModule() {}
+    bool OnInit() { wxDDEInitialize(); return TRUE; };
+    void OnExit() { wxDDECleanUp(); };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxDDEModule, wxModule)
+

 // Global find connection
 static wxDDEConnection *DDEFindConnection(HCONV hConv)
 {
 // Global find connection
 static wxDDEConnection *DDEFindConnection(HCONV hConv)
 {