added common notebookbase source file

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index baf1e064b22cd01de070a410e9192c3d2a2cf739..3cbe217392774f9da5505f951757eade7f7d6433 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -55,17 +55,23 @@
 #include <windows.h>
 
 #include "wx/msw/private.h"
+
+#ifndef __WXMICROWIN__
 #include "wx/msw/dib.h"
+#endif
 
 // wxDataObject is tied to OLE/drag and drop implementation, therefore so are
 // the functions using wxDataObject in wxClipboard
-#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP
+//#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP
 
 #if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
 
-    // use OLE clipboard
-    #define wxUSE_OLE_CLIPBOARD 1
+// No: don't necessarily use OLE clipboard with data object
+#if 0
+   // use OLE clipboard
+   #define wxUSE_OLE_CLIPBOARD 1
+#endif
 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0