X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/msw/clipbrd.cpp?ds=sidebyside diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index ed6896cb65..d01c281dae 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -55,7 +55,10 @@ #include #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,7 +66,9 @@ #if wxUSE_DATAOBJ #include "wx/dataobj.h" +#endif +#if wxUSE_OLE // use OLE clipboard #define wxUSE_OLE_CLIPBOARD 1 #else // !wxUSE_DATAOBJ @@ -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 @@ -823,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