added new text event macros description

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index ed6896cb6571e77ebb1dc6a06cf95b30b7559349..63de0214ee05798322748cae84b0ed0dc929dbab 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/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
@@ -63,9 +66,11 @@
 
 #if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
+#endif
 
-    // use OLE clipboard
-    #define wxUSE_OLE_CLIPBOARD 1
+#if wxUSE_OLE
+   // use OLE clipboard
+   #define wxUSE_OLE_CLIPBOARD 1
 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0
@@ -628,7 +633,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     // build the list of supported formats
     size_t nFormats = data.GetFormatCount(wxDataObject::Set);
     wxDataFormat format;
-       wxDataFormat *formats;
+    wxDataFormat *formats;
     if ( nFormats == 1 )
     {
         // the most common case