X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1ee679c2e3f48bc4f2607e35033ed5505ed6665..12db77cab1054d288a2b3e2d07e58ad1d6386a53:/src/msw/clipbrd.cpp diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index a24d4c3c58..d9ca91ec44 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -474,6 +474,15 @@ bool wxClipboard::Open() #endif } +bool wxClipboard::IsOpened() const +{ +#if wxUSE_OLE_CLIPBOARD + return TRUE; +#else + return wxIsClipboardOpened(); +#endif +} + bool wxClipboard::SetData( wxDataObject *data ) { (void)wxEmptyClipboard(); @@ -584,7 +593,7 @@ bool wxClipboard::GetData( wxDataObject *data ) } // build the list of supported formats - size_t nFormats = data->GetFormatCount(FALSE /* for SetData() */); + size_t nFormats = data->GetFormatCount(wxDataObject::Set); wxDataFormat format, *formats; if ( nFormats == 1 ) { @@ -597,7 +606,7 @@ bool wxClipboard::GetData( wxDataObject *data ) formats = new wxDataFormat[nFormats]; } - data->GetAllFormats(formats, FALSE); + data->GetAllFormats(formats, wxDataObject::Set); // get the format enumerator bool result = FALSE;