X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb172b4f12fae80b06d5936108a1bc7f2521674..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/msw/clipbrd.cpp?ds=inline

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 3cbe217392..d01c281dae 100644
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -66,12 +66,11 @@
 
 #if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
-
-// No: don't necessarily use OLE clipboard with data object
-#if 0
-   // use OLE clipboard
-   #define wxUSE_OLE_CLIPBOARD 1
 #endif
+
+#if wxUSE_OLE
+    // use OLE clipboard
+    #define wxUSE_OLE_CLIPBOARD 1
 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0
@@ -634,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
@@ -829,7 +828,5 @@ bool wxClipboard::GetData( wxDataObject& data )
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
-#else
-//    #error "Please turn wxUSE_CLIPBOARD on to compile this file."
 #endif // wxUSE_CLIPBOARD