X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..eddd3a9d374a366c94f481326f7f58ef67f5628a:/src/mac/carbon/metafile.cpp diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp index fc6c64b825..9d3d1576b7 100644 --- a/src/mac/carbon/metafile.cpp +++ b/src/mac/carbon/metafile.cpp @@ -83,19 +83,21 @@ wxMetaFile::~wxMetaFile() bool wxMetaFile::SetClipboard(int width, int height) { +#if wxUSE_DRAG_AND_DROP +//TODO finishi this port , we need the data obj first if (!m_refData) return FALSE; - bool alreadyOpen=wxClipboardOpen(); + bool alreadyOpen=wxTheClipboard->IsOpened() ; if (!alreadyOpen) { - wxOpenClipboard(); - if (!wxEmptyClipboard()) return FALSE; + wxTheClipboard->Open(); + if (!wxTheClipboard->Clear()) return FALSE; } bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height); if (!alreadyOpen) wxCloseClipboard(); return (bool) success; - +#endif return TRUE ; } @@ -115,23 +117,11 @@ bool wxMetaFile::Play(wxDC *dc) if (!dc->Ok() ) return FALSE; - dc->MacVerifySetup() ; - { + wxMacPortSetter helper( dc ) ; PicHandle pict = GetHMETAFILE() ; DrawPicture( pict , &(**pict).picFrame ) ; } -/* - if (!m_refData) - return FALSE; - - dc->BeginDrawing(); - - if (dc->GetHDC() && M_METAFILEDATA->m_metafile) - PlayMetaFile((HDC) dc->GetHDC(), (HMETAFILE) M_METAFILEDATA->m_metafile); - - dc->EndDrawing(); -*/ return TRUE; }