X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..6d4737120776b48a1bb4e8e5575329e213a50810:/src/msw/clipbrd.cpp diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index 7802a92ac8..9d35124765 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -146,20 +146,22 @@ bool wxIsClipboardOpened() bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat) { - if ( ::IsClipboardFormatAvailable(dataFormat) ) + wxDataFormat::NativeFormat cf = dataFormat.GetFormatId(); + + if ( ::IsClipboardFormatAvailable(cf) ) { // ok from the first try return TRUE; } // for several standard formats, we can convert from some other ones too - switch ( dataFormat.GetFormatId() ) + switch ( cf ) { // for bitmaps, DIBs will also do case CF_BITMAP: return ::IsClipboardFormatAvailable(CF_DIB) != 0; -#if wxUSE_ENH_METAFILE && !defined(__WIN16__) && !defined(__WXWINCE__) +#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__) case CF_METAFILEPICT: return ::IsClipboardFormatAvailable(CF_ENHMETAFILE) != 0; #endif // wxUSE_ENH_METAFILE @@ -219,10 +221,13 @@ bool wxSetClipboardData(wxDataFormat dataFormat, { wxBitmap *bitmap = (wxBitmap *)data; - HGLOBAL hDIB = wxDIB::ConvertFromBitmap(GetHbitmapOf(*bitmap)); - if ( hDIB ) + if ( bitmap && bitmap->Ok() ) { - handle = ::SetClipboardData(CF_DIB, hDIB); + wxDIB dib(*bitmap); + if ( dib.IsOk() ) + { + handle = ::SetClipboardData(CF_DIB, dib.Detach()); + } } break; } @@ -250,7 +255,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, } #endif // wxUSE_METAFILE -#if wxUSE_ENH_METAFILE && !defined(__WIN16__) && !defined(__WXWINCE__) +#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__) case wxDF_ENHMETAFILE: { wxEnhMetaFile *emf = (wxEnhMetaFile *)data; @@ -430,9 +435,6 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) wxBM->SetWidth(bm.bmWidth); wxBM->SetHeight(bm.bmHeight); wxBM->SetDepth(bm.bmPlanes); -#if WXWIN_COMPATIBILITY_2 - wxBM->SetOk(TRUE); -#endif // WXWIN_COMPATIBILITY_2 retval = wxBM; break; } @@ -663,7 +665,7 @@ bool wxClipboard::AddData( wxDataObject *data ) { #if 1 // TODO - wxLogError("Not implemented because wxMetafileDataObject does not contain width and height values."); + wxLogError(wxT("Not implemented because wxMetafileDataObject does not contain width and height values.")); return FALSE; #else wxMetafileDataObject* metaFileDataObject = @@ -699,7 +701,7 @@ void wxClipboard::Close() #endif } -bool wxClipboard::IsSupported( wxDataFormat format ) +bool wxClipboard::IsSupported( const wxDataFormat& format ) { return wxIsClipboardFormatAvailable(format); } @@ -733,9 +735,16 @@ bool wxClipboard::GetData( wxDataObject& data ) data.GetAllFormats(formats, wxDataObject::Set); - // get the format enumerator + // get the data for the given formats + FORMATETC formatEtc; + CLIPFORMAT cf; bool result = FALSE; - wxArrayInt supportedFormats; + + // enumerate all explicit formats on the clipboard. + // note that this does not include implicit / synthetic (automatically + // converted) formats. +#ifdef __WXDEBUG__ + // get the format enumerator IEnumFORMATETC *pEnumFormatEtc = NULL; hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc); if ( FAILED(hr) || !pEnumFormatEtc ) @@ -746,7 +755,6 @@ bool wxClipboard::GetData( wxDataObject& data ) else { // ask for the supported formats and see if there are any we support - FORMATETC formatEtc; for ( ;; ) { ULONG nCount; @@ -759,101 +767,92 @@ bool wxClipboard::GetData( wxDataObject& data ) break; } - CLIPFORMAT cf = formatEtc.cfFormat; + cf = formatEtc.cfFormat; -#ifdef __WXDEBUG__ wxLogTrace(wxTRACE_OleCalls, wxT("Object on the clipboard supports format %s."), wxDataObject::GetFormatName(cf)); -#endif // Debug - - // is supported? - for ( size_t n = 0; n < nFormats; n++ ) - { - if ( formats[n].GetFormatId() == cf ) - { - if ( supportedFormats.Index(cf) == wxNOT_FOUND ) - { - supportedFormats.Add(cf); - } - } - } } pEnumFormatEtc->Release(); } +#endif // Debug - if ( formats != &format ) - { - delete [] formats; - } - //else: we didn't allocate any memory - - if ( !supportedFormats.IsEmpty() ) + STGMEDIUM medium; + // stop at the first valid format found on the clipboard + for ( size_t n = 0; !result && (n < nFormats); n++ ) { - FORMATETC formatEtc; + // convert to NativeFormat Id + cf = formats[n].GetFormatId(); + + // if the format is not available, try the next one + // this test includes implicit / sythetic formats + if ( !::IsClipboardFormatAvailable(cf) ) + continue; + + formatEtc.cfFormat = cf; formatEtc.ptd = NULL; formatEtc.dwAspect = DVASPECT_CONTENT; formatEtc.lindex = -1; - size_t nSupportedFormats = supportedFormats.GetCount(); - for ( size_t n = 0; !result && (n < nSupportedFormats); n++ ) + // use the appropriate tymed + switch ( formatEtc.cfFormat ) { - STGMEDIUM medium; - formatEtc.cfFormat = supportedFormats[n]; + case CF_BITMAP: + formatEtc.tymed = TYMED_GDI; + break; - // use the appropriate tymed - switch ( formatEtc.cfFormat ) - { - case CF_BITMAP: - formatEtc.tymed = TYMED_GDI; - break; #ifndef __WXWINCE__ - case CF_METAFILEPICT: - formatEtc.tymed = TYMED_MFPICT; - break; + case CF_METAFILEPICT: + formatEtc.tymed = TYMED_MFPICT; + break; - case CF_ENHMETAFILE: - formatEtc.tymed = TYMED_ENHMF; - break; + case CF_ENHMETAFILE: + formatEtc.tymed = TYMED_ENHMF; + break; #endif - default: - formatEtc.tymed = TYMED_HGLOBAL; - } - // try to get data - hr = pDataObject->GetData(&formatEtc, &medium); - if ( FAILED(hr) ) + default: + formatEtc.tymed = TYMED_HGLOBAL; + } + + // try to get data + hr = pDataObject->GetData(&formatEtc, &medium); + if ( FAILED(hr) ) + { + // try other tymed for GDI objects + if ( formatEtc.cfFormat == CF_BITMAP ) { - // try other tymed for GDI objects - if ( formatEtc.cfFormat == CF_BITMAP ) - { - formatEtc.tymed = TYMED_HGLOBAL; - hr = pDataObject->GetData(&formatEtc, &medium); - } + formatEtc.tymed = TYMED_HGLOBAL; + hr = pDataObject->GetData(&formatEtc, &medium); } + } - if ( SUCCEEDED(hr) ) + if ( SUCCEEDED(hr) ) + { + // pass the data to the data object + hr = data.GetInterface()->SetData(&formatEtc, &medium, TRUE); + if ( FAILED(hr) ) { - // pass the data to the data object - hr = data.GetInterface()->SetData(&formatEtc, &medium, TRUE); - if ( FAILED(hr) ) - { - wxLogDebug(wxT("Failed to set data in wxIDataObject")); + wxLogDebug(wxT("Failed to set data in wxIDataObject")); - // IDataObject only takes the ownership of data if it - // successfully got it - which is not the case here - ReleaseStgMedium(&medium); - } - else - { - result = TRUE; - } + // IDataObject only takes the ownership of data if it + // successfully got it - which is not the case here + ReleaseStgMedium(&medium); + } + else + { + result = TRUE; } - //else: unsupported tymed? } + //else: unsupported tymed? } - //else: unsupported format + + if ( formats != &format ) + { + delete [] formats; + } + //else: we didn't allocate any memory // clean up and return pDataObject->Release();