make --static flag act on --cppflags too.

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 3cbe217392774f9da5505f951757eade7f7d6433..d01c281dae821ac4e39ec8bef2c08ef0476ad54a 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -66,12 +66,11 @@
 
 #if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
 
 #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
 #endif

+
+#if wxUSE_OLE
+    // 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


@@ -634,7 +633,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     // build the list of supported formats
     size_t nFormats = data.GetFormatCount(wxDataObject::Set);
     wxDataFormat format;
     // 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
     if ( nFormats == 1 )
     {
         // the most common case


@@ -829,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