Use empty check consistent with other parts.

[wxWidgets.git] / src / mac / carbon / metafile.cpp

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index aca4bc0ae5b233e18a9c5c17177a2da896b1cda2..04c45ae760ccc944be706035c5598dc638357654 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "metafile.h"
 #endif
 
 #pragma implementation "metafile.h"
 #endif
 


@@ -20,10 +20,6 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/setup.h"
-#endif
-

 #if wxUSE_METAFILE
 
 #ifndef WX_PRECOMP
 #if wxUSE_METAFILE
 
 #ifndef WX_PRECOMP


@@ -46,6 +42,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 #endif
 

+class wxMetafileRefData: public wxGDIRefData
+{
+    friend class WXDLLEXPORT wxMetafile;
+public:
+    wxMetafileRefData(void);
+    ~wxMetafileRefData(void);
+
+private:
+    PicHandle m_metafile;
+#if wxMAC_USE_CORE_GRAPHICS
+    QDPictRef m_qdPictRef ;
+#endif
+};
+
+

 /*
  * Metafiles
  * Currently, the only purpose for making a metafile is to put
 /*
  * Metafiles
  * Currently, the only purpose for making a metafile is to put


@@ -55,6 +66,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 wxMetafileRefData::wxMetafileRefData(void)
 {
     m_metafile = 0;
 wxMetafileRefData::wxMetafileRefData(void)
 {
     m_metafile = 0;

+#if wxMAC_USE_CORE_GRAPHICS
+    m_qdPictRef = NULL ;
+#endif

 }
 
 wxMetafileRefData::~wxMetafileRefData(void)
 }
 
 wxMetafileRefData::~wxMetafileRefData(void)


@@ -63,6 +77,10 @@ wxMetafileRefData::~wxMetafileRefData(void)
     {
         KillPicture( (PicHandle) m_metafile ) ;
         m_metafile = 0;
     {
         KillPicture( (PicHandle) m_metafile ) ;
         m_metafile = 0;

+#if wxMAC_USE_CORE_GRAPHICS
+        QDPictRelease( m_qdPictRef ) ;
+        m_qdPictRef = NULL ;
+#endif

     }
 }
 
     }
 }
 


@@ -70,7 +88,6 @@ wxMetaFile::wxMetaFile(const wxString& file)
 {
     m_refData = new wxMetafileRefData;
 
 {
     m_refData = new wxMetafileRefData;
 

-

     M_METAFILEDATA->m_metafile = 0;
     wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ;
 /*
     M_METAFILEDATA->m_metafile = 0;
     wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ;
 /*


@@ -83,6 +100,16 @@ wxMetaFile::~wxMetaFile()
 {
 }
 
 {
 }
 

+bool wxMetaFile::Ok() const 
+{ 
+    return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); 
+}
+
+WXHMETAFILE wxMetaFile::GetHMETAFILE() const 
+{ 
+    return (WXHMETAFILE) M_METAFILEDATA->m_metafile; 
+}
+

 bool wxMetaFile::SetClipboard(int width, int height)
 {
 #if wxUSE_DRAG_AND_DROP
 bool wxMetaFile::SetClipboard(int width, int height)
 {
 #if wxUSE_DRAG_AND_DROP


@@ -108,10 +135,26 @@ bool wxMetaFile::SetClipboard(int width, int height)
 
 void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 {
 
 void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 {

-    if (!m_refData)
-        m_refData = new wxMetafileRefData;
+    UnRef() ;
+    
+    m_refData = new wxMetafileRefData;

 
 

-    M_METAFILEDATA->m_metafile = 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 )
+    {
+        M_METAFILEDATA->m_qdPictRef = QDPictCreateWithProvider( provider ) ;
+        CGDataProviderRelease( provider ) ;
+    }
+#endif

 }
 
 bool wxMetaFile::Play(wxDC *dc)
 }
 
 bool wxMetaFile::Play(wxDC *dc)


@@ -123,59 +166,66 @@ bool wxMetaFile::Play(wxDC *dc)
         return FALSE;
         
     {
         return FALSE;
         
     {

-        wxMacPortSetter helper( dc ) ;
+#if wxMAC_USE_CORE_GRAPHICS
+        QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef ;
+        CGContextRef cg = ((wxMacCGContext*)(dc->GetGraphicContext()))->GetNativeContext() ;
+        CGRect bounds = QDPictGetBounds( cgPictRef ) ;
+
+        CGContextSaveGState(cg);    
+        CGContextTranslateCTM(cg, 0 , bounds.size.width );
+        CGContextScaleCTM(cg, 1, -1);
+        QDPictDrawToCGContext( cg , bounds , cgPictRef ) ;
+        CGContextRestoreGState( cg ) ;
+#else

         PicHandle pict = (PicHandle) GetHMETAFILE() ;
         PicHandle pict = (PicHandle) GetHMETAFILE() ;

+        wxMacPortSetter helper( dc ) ;

         DrawPicture( pict , &(**pict).picFrame ) ;
         DrawPicture( pict , &(**pict).picFrame ) ;

+#endif

     }
     return TRUE;
 }
 
     }
     return TRUE;
 }
 

+wxSize wxMetaFile::GetSize() const
+{
+    wxSize size = wxDefaultSize ;
+    if ( Ok() )
+    {
+        PicHandle pict = (PicHandle) GetHMETAFILE() ;
+        Rect &r = (**pict).picFrame ;
+        size.x = r.right - r.left ;
+        size.y = r.bottom - r.top ;
+    }
+
+    return size;
+}
+

 /*
  * Metafile device context
  *
  */
 
 /*
  * Metafile device context
  *
  */
 

-// Original constructor that does not takes origin and extent. If you use this,
-// *DO* give origin/extent arguments to wxMakeMetaFilePlaceable.
-wxMetaFileDC::wxMetaFileDC(const wxString& file)
-{
-    m_metaFile = NULL;
-    m_minX = 10000;
-    m_minY = 10000;
-    m_maxX = -10000;
-    m_maxY = -10000;
-    
-    wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ;
-    
-    m_metaFile = new wxMetaFile(wxEmptyString) ;
-    Rect r={0,0,1000,1000} ;
-    
-    m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
-    ::GetPort( (GrafPtr*) &m_macPort ) ;    
-    m_ok = TRUE ;
-    
-    SetMapMode(wxMM_TEXT); 
-}
-

 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetaFilePlaceable.
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetaFilePlaceable.
 

-wxMetaFileDC::wxMetaFileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
+wxMetaFileDC::wxMetaFileDC(const wxString& filename ,
+                    int width , int height ,
+                    const wxString& WXUNUSED(description) )

 {
 {

-    m_minX = 10000;
-    m_minY = 10000;
-    m_maxX = -10000;
-    m_maxY = -10000;
-    
-    wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet")) ;
+    wxASSERT_MSG( width == 0 || height == 0 , _T("no arbitration of metafilesize supported") ) ;
+    wxASSERT_MSG( filename.IsEmpty() , _T("no file based metafile support yet")) ;

     
     

-    m_metaFile = new wxMetaFile(wxEmptyString) ;
-    Rect r={yorg,xorg,yorg+yext,xorg+xext} ;
+    m_metaFile = new wxMetaFile(filename) ;
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+    Rect r={0,0,height,width} ;

     
     

-    m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
+    RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ;
+    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
+
+    m_metaFile->SetHMETAFILE( (WXHMETAFILE) OpenPicture( &r ) ) ;

     ::GetPort( (GrafPtr*) &m_macPort ) ;    
     m_ok = TRUE ;
     ::GetPort( (GrafPtr*) &m_macPort ) ;    
     m_ok = TRUE ;

-    
+#endif

     SetMapMode(wxMM_TEXT); 
 }
 
     SetMapMode(wxMM_TEXT); 
 }
 


@@ -183,6 +233,15 @@ wxMetaFileDC::~wxMetaFileDC()
 {
 }
 
 {
 }
 

+void wxMetaFileDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_metaFile , _T("GetSize() doesn't work without a metafile") );
+
+    wxSize sz = m_metaFile->GetSize() ;
+    if (width) (*width) = sz.x;
+    if (height) (*height) = sz.y;
+}
+

 wxMetaFile *wxMetaFileDC::Close()
 {
     ClosePicture() ;
 wxMetaFile *wxMetaFileDC::Close()
 {
     ClosePicture() ;


@@ -204,9 +263,10 @@ bool wxMetafileDataObject::GetDataHere(void *buf) const
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {

-    Handle handle = (Handle) m_metafile.GetHMETAFILE() ;
+    Handle handle = NewHandle( len ) ;

     SetHandleSize( handle , len ) ;
     memcpy( *handle , buf , len ) ;
     SetHandleSize( handle , len ) ;
     memcpy( *handle , buf , len ) ;

+    m_metafile.SetHMETAFILE( (WXHMETAFILE) handle ) ;

     return true ;
 }
 #endif
     return true ;
 }
 #endif