X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/274b7a40ef7abdd6324c545578be96a529ec8eb9..f84a986cfc6e512240b77fcdfbacc769b8a0cd02:/src/mac/carbon/metafile.cpp diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp index 2aabd1d709..a99899b188 100644 --- a/src/mac/carbon/metafile.cpp +++ b/src/mac/carbon/metafile.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: metafile.cpp +// Name: src/mac/carbon/metafile.cpp // Purpose: wxMetaFile, wxMetaFileDC etc. These classes are optional. // Author: Stefan Csomor // Modified by: @@ -8,12 +8,12 @@ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// +// Currently, the only purpose for making a metafile +// is to put it on the clipboard. -#include "wx/wxprec.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif +#include "wx/wxprec.h" #if wxUSE_METAFILE @@ -25,6 +25,7 @@ #include "wx/metafile.h" #include "wx/clipbrd.h" #include "wx/mac/private.h" +#include "wx/graphics.h" #include #include @@ -38,7 +39,7 @@ class wxMetafileRefData: public wxGDIRefData public: wxMetafileRefData(); - ~wxMetafileRefData(); + virtual ~wxMetafileRefData(); private: PicHandle m_metafile; @@ -48,16 +49,9 @@ private: #endif }; -extern bool wxClipboardIsOpen; - - -// Metafiles: -// Currently, the only purpose for making a metafile -// is to put it on the clipboard. - wxMetafileRefData::wxMetafileRefData() { - m_metafile = 0; + m_metafile = NULL; #if wxMAC_USE_CORE_GRAPHICS m_qdPictRef = NULL; @@ -68,12 +62,14 @@ wxMetafileRefData::~wxMetafileRefData() { if (m_metafile) { +#ifndef __LP64__ KillPicture( (PicHandle)m_metafile ); m_metafile = NULL; #if wxMAC_USE_CORE_GRAPHICS QDPictRelease( m_qdPictRef ); m_qdPictRef = NULL; +#endif #endif } } @@ -82,8 +78,8 @@ wxMetaFile::wxMetaFile(const wxString& file) { m_refData = new wxMetafileRefData; - M_METAFILEDATA->m_metafile = 0; - wxASSERT_MSG( file.empty(), wxT("no file based metafile support yet") ); + M_METAFILEDATA->m_metafile = NULL; + wxASSERT_MSG( file.empty(), wxT("no file-based metafile support yet") ); #if 0 if (!file.IsNull() && (file.Cmp("") == 0)) @@ -95,9 +91,9 @@ wxMetaFile::~wxMetaFile() { } -bool wxMetaFile::Ok() const +bool wxMetaFile::IsOk() const { - return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); + return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != NULL)); } WXHMETAFILE wxMetaFile::GetHMETAFILE() const @@ -110,8 +106,8 @@ bool wxMetaFile::SetClipboard(int width, int height) bool success = true; #if wxUSE_DRAG_AND_DROP - // TODO: to finish this port, we need the data obj first - if (!m_refData) + // TODO: to finish this port, we need the data object first + if (m_refData == NULL) return false; bool alreadyOpen = wxTheClipboard->IsOpened(); @@ -136,24 +132,27 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf) m_refData = new wxMetafileRefData; - M_METAFILEDATA->m_metafile = (PicHandle) mf; + M_METAFILEDATA->m_metafile = (PicHandle)mf; #if wxMAC_USE_CORE_GRAPHICS size_t sz = GetHandleSize( (Handle) M_METAFILEDATA->m_metafile ); wxMemoryBuffer* membuf = new wxMemoryBuffer( sz ); void *data = membuf->GetWriteBuf( sz ); + memcpy( data, *M_METAFILEDATA->m_metafile, sz ); membuf->UngetWriteBuf( sz ); CGDataProviderRef provider = CGDataProviderCreateWithData( membuf, data, sz, wxMacMemoryBufferReleaseProc ); M_METAFILEDATA->m_qdPictRef = NULL; - if ( provider != NULL ) +#ifndef __LP64__ + if (provider != NULL) { M_METAFILEDATA->m_qdPictRef = QDPictCreateWithProvider( provider ); CGDataProviderRelease( provider ); } #endif +#endif } bool wxMetaFile::Play(wxDC *dc) @@ -161,24 +160,27 @@ bool wxMetaFile::Play(wxDC *dc) if (!m_refData) return false; - if (!dc->Ok() ) + if (!dc->Ok()) return false; { #if wxMAC_USE_CORE_GRAPHICS +#ifndef __LP64__ QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef; - CGContextRef cg = ((wxMacCGContext*)(dc->GetGraphicContext()))->GetNativeContext(); + CGContextRef cg = (CGContextRef) dc->GetGraphicsContext()->GetNativeContext(); CGRect bounds = QDPictGetBounds( cgPictRef ); CGContextSaveGState( cg ); - CGContextTranslateCTM( cg, 0 , bounds.size.width ); + CGContextTranslateCTM( cg, 0, bounds.size.width ); CGContextScaleCTM( cg, 1, -1 ); - QDPictDrawToCGContext( cg , bounds, cgPictRef ); + QDPictDrawToCGContext( cg, bounds, cgPictRef ); CGContextRestoreGState( cg ); +#endif #else - PicHandle pict = (PicHandle) GetHMETAFILE(); + PicHandle pict = (PicHandle)GetHMETAFILE(); wxMacPortSetter helper( dc ); - DrawPicture( pict , &(**pict).picFrame ); + Rect picFrame; + DrawPicture( pict, wxMacGetPictureBounds( pict, &picFrame ) ); #endif } @@ -187,17 +189,20 @@ bool wxMetaFile::Play(wxDC *dc) wxSize wxMetaFile::GetSize() const { - wxSize size = wxDefaultSize ; + wxSize dataSize = wxDefaultSize; - if ( Ok() ) + if (Ok()) { - PicHandle pict = (PicHandle) GetHMETAFILE() ; - Rect &r = (**pict).picFrame ; - size.x = r.right - r.left ; - size.y = r.bottom - r.top ; +#ifndef __LP64__ + PicHandle pict = (PicHandle)GetHMETAFILE(); + Rect r; + wxMacGetPictureBounds( pict, &r ); + dataSize.x = r.right - r.left; + dataSize.y = r.bottom - r.top; +#endif } - return size; + return dataSize; } // Metafile device context @@ -205,12 +210,13 @@ wxSize wxMetaFile::GetSize() const // New constructor that takes origin and extent. If you use this, don't // give origin/extent arguments to wxMakeMetaFilePlaceable. -wxMetaFileDC::wxMetaFileDC(const wxString& filename , - int width , int height , - const wxString& WXUNUSED(description) ) +wxMetaFileDC::wxMetaFileDC( + const wxString& filename, + int width, int height, + const wxString& WXUNUSED(description) ) { - wxASSERT_MSG( width == 0 || height == 0 , wxT("no arbitration of metafilesize supported") ); - wxASSERT_MSG( filename.empty() , wxT("no file based metafile support yet")); + wxASSERT_MSG( width <= 0 || height <= 0, wxT("no arbitration of metafile size supported") ); + wxASSERT_MSG( filename.empty(), wxT("no file based metafile support yet")); m_metaFile = new wxMetaFile( filename ); @@ -218,13 +224,13 @@ wxMetaFileDC::wxMetaFileDC(const wxString& filename , #else Rect r = { 0, 0, height, width }; - RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ); - CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ); + RectRgn( (RgnHandle)m_macBoundaryClipRgn, &r ); + CopyRgn( (RgnHandle)m_macBoundaryClipRgn, (RgnHandle)m_macCurrentClipRgn ); - m_metaFile->SetHMETAFILE( (WXHMETAFILE) OpenPicture( &r ) ); - ::GetPort( (GrafPtr*) &m_macPort ); + m_metaFile->SetHMETAFILE( (WXHMETAFILE)OpenPicture( &r ) ); + ::GetPort( (GrafPtr*)&m_macPort ); - m_ok = true ; + m_ok = true; #endif SetMapMode( wxMM_TEXT ); @@ -236,9 +242,9 @@ wxMetaFileDC::~wxMetaFileDC() void wxMetaFileDC::DoGetSize(int *width, int *height) const { - wxCHECK_RET( m_metaFile , wxT("GetSize() doesn't work without a metafile") ); + wxCHECK_RET( m_metaFile, wxT("GetSize() doesn't work without a metafile") ); - wxSize sz = m_metaFile->GetSize() ; + wxSize sz = m_metaFile->GetSize(); if (width) (*width) = sz.x; if (height) @@ -247,8 +253,9 @@ void wxMetaFileDC::DoGetSize(int *width, int *height) const wxMetaFile *wxMetaFileDC::Close() { - ClosePicture() ; - +#ifndef __LP64__ + ClosePicture(); +#endif return m_metaFile; } @@ -260,10 +267,13 @@ size_t wxMetafileDataObject::GetDataSize() const bool wxMetafileDataObject::GetDataHere(void *buf) const { - memcpy( buf , (*(PicHandle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE()) , - GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ); + Handle pictH = (Handle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE(); + bool result = (pictH != NULL); - return true; + if (result) + memcpy( buf, *pictH, GetHandleSize( pictH ) ); + + return result; } bool wxMetafileDataObject::SetData(size_t len, const void *buf) @@ -273,7 +283,7 @@ bool wxMetafileDataObject::SetData(size_t len, const void *buf) memcpy( *handle, buf, len ); m_metafile.SetHMETAFILE( (WXHMETAFILE) handle ); - return true ; + return true; } #endif