Various wxUniversal/wxMicroWindows fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/clipbrd.cpp

@@ -55,7 +55,10 @@
 #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
@@ -64,8 +67,11 @@
 #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