X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..49a91764b57168d9f441578001b3206a7330ee70:/src/mac/carbon/metafile.cpp?ds=sidebyside diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp index 5742ba4ce6..9d3d1576b7 100644 --- a/src/mac/carbon/metafile.cpp +++ b/src/mac/carbon/metafile.cpp @@ -39,8 +39,10 @@ extern bool wxClipboardIsOpen; +#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC) +#endif /* * Metafiles @@ -57,7 +59,7 @@ wxMetafileRefData::~wxMetafileRefData(void) { if (m_metafile) { - KillPicture( m_metafile ) ; + KillPicture( m_metafile ) ; m_metafile = 0; } } @@ -81,22 +83,32 @@ 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; - */ + return (bool) success; +#endif return TRUE ; } +void wxMetafile::SetHMETAFILE(PicHandle mf) +{ + if (!m_refData) + m_refData = new wxMetafileRefData; + + M_METAFILEDATA->m_metafile = mf; +} + bool wxMetaFile::Play(wxDC *dc) { if (!m_refData) @@ -105,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; } @@ -142,11 +142,11 @@ wxMetaFileDC::wxMetaFileDC(const wxString& file) wxASSERT_MSG( file.IsEmpty() , "no file based metafile support yet") ; - m_metaFile = new wxMetaFile("") ; - Rect r={0,0,100,100} ; + m_metaFile = new wxMetaFile("") ; + Rect r={0,0,1000,1000} ; - m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ; - ::GetPort( &m_macPort ) ; + m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ; + ::GetPort( &m_macPort ) ; m_ok = TRUE ; SetMapMode(wxMM_TEXT); @@ -184,5 +184,4 @@ wxMetaFile *wxMetaFileDC::Close() return m_metaFile; } - #endif