X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/110a0fea88321caaac0a6fa44901c7fb731416a8..82ceade76a4913f9c6fd8dfda1fb291bf08e1d89:/src/msw/clipbrd.cpp

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 96813f8f58..8955fe8840 100644
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -28,10 +28,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-
 #if wxUSE_CLIPBOARD
 
 #ifndef WX_PRECOMP
@@ -54,9 +50,10 @@
 #include <string.h>
 
 #include "wx/msw/private.h"
+#include "wx/msw/ole/oleutils.h"
 
 #if wxUSE_WXDIB
-#include "wx/msw/dib.h"
+    #include "wx/msw/dib.h"
 #endif
 
 // wxDataObject is tied to OLE/drag and drop implementation, therefore so are
@@ -534,6 +531,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
+#if wxUSE_OLE_CLIPBOARD
+    wxOleInitialize();
+#endif
+
     m_clearOnExit = false;
     m_isOpened = false;
 }
@@ -544,6 +545,10 @@ wxClipboard::~wxClipboard()
     {
         Clear();
     }
+
+#if wxUSE_OLE_CLIPBOARD
+    wxOleUninitialize();
+#endif
 }
 
 void wxClipboard::Clear()