X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb172b4f12fae80b06d5936108a1bc7f2521674..f2616db56739e4962f683f59ac9e207756efe23c:/src/msw/clipbrd.cpp diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index 3cbe217392..63de0214ee 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -66,12 +66,11 @@ #if wxUSE_DATAOBJ #include "wx/dataobj.h" +#endif -// No: don't necessarily use OLE clipboard with data object -#if 0 +#if wxUSE_OLE // use OLE clipboard #define wxUSE_OLE_CLIPBOARD 1 -#endif #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