no changes

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 63de0214ee05798322748cae84b0ed0dc929dbab..d01c281dae821ac4e39ec8bef2c08ef0476ad54a 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -69,8 +69,8 @@
 #endif
 
 #if wxUSE_OLE
 #endif
 
 #if wxUSE_OLE

-   // use OLE clipboard
-   #define wxUSE_OLE_CLIPBOARD 1
+    // use OLE clipboard
+    #define wxUSE_OLE_CLIPBOARD 1

 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0
 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0


@@ -828,7 +828,5 @@ bool wxClipboard::GetData( wxDataObject& data )
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 

-#else
-//    #error "Please turn wxUSE_CLIPBOARD on to compile this file."

 #endif // wxUSE_CLIPBOARD
 
 #endif // wxUSE_CLIPBOARD