Font (possible) fix

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 6a0a3a9eab2cd3685517be9737f27a1be7cdd03f..3dd6682e8421832ac646d91ec3a43b92b4990346 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        metafile.cpp
 // Purpose:     wxMetaFile, wxMetaFileDC etc. These classes are optional.
 /////////////////////////////////////////////////////////////////////////////
 // Name:        metafile.cpp
 // Purpose:     wxMetaFile, wxMetaFileDC etc. These classes are optional.

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "metafile.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,10 +16,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


@@ -34,15 +26,30 @@
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 

+#include "wx/mac/private.h"
+

 #include <stdio.h>
 #include <string.h>
 
 extern bool wxClipboardIsOpen;
 
 #include <stdio.h>
 #include <string.h>
 
 extern bool wxClipboardIsOpen;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)

+
+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
 #endif

+};
+

 
 /*
  * Metafiles
 
 /*
  * Metafiles


@@ -53,14 +60,21 @@ 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)
 {
     if (m_metafile)
     {
 }
 
 wxMetafileRefData::~wxMetafileRefData(void)
 {
     if (m_metafile)
     {

-               KillPicture( m_metafile ) ;
+        KillPicture( (PicHandle) m_metafile ) ;

         m_metafile = 0;
         m_metafile = 0;

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

     }
 }
 
     }
 }
 


@@ -68,9 +82,8 @@ wxMetaFile::wxMetaFile(const wxString& file)
 {
     m_refData = new wxMetafileRefData;
 
 {
     m_refData = new wxMetafileRefData;
 

-

     M_METAFILEDATA->m_metafile = 0;
     M_METAFILEDATA->m_metafile = 0;

-    wxASSERT_MSG( file.IsEmpty() , "no file based metafile support yet") ;
+    wxASSERT_MSG( file.empty() , wxT("no file based metafile support yet") ) ;

 /*
     if (!file.IsNull() && (file.Cmp("") == 0))
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
 /*
     if (!file.IsNull() && (file.Cmp("") == 0))
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);


@@ -81,46 +94,105 @@ 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)
 {
 bool wxMetaFile::SetClipboard(int width, int height)
 {

+    bool success = true;
+
+#if wxUSE_DRAG_AND_DROP
+    //TODO finishi this port , we need the data obj first

     if (!m_refData)
     if (!m_refData)

-        return FALSE;
+        return false;

 
 

-    bool alreadyOpen=wxClipboardOpen();
+    bool alreadyOpen=wxTheClipboard->IsOpened() ;

     if (!alreadyOpen)
     {
     if (!alreadyOpen)
     {

-        wxOpenClipboard();
-        if (!wxEmptyClipboard()) return FALSE;
+        wxTheClipboard->Open();
+        wxTheClipboard->Clear();

     }
     }

-    bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
-    if (!alreadyOpen) wxCloseClipboard();
-           return (bool) success;
+    wxDataObject *data =
+        new wxMetafileDataObject( *this) ;
+    success = wxTheClipboard->SetData(data);
+    if (!alreadyOpen)
+        wxTheClipboard->Close();
+#endif

 
 

-    return TRUE ;
+    return success;

 }
 
 }
 

-void wxMetafile::SetHMETAFILE(PicHandle 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)
 {

-  if (!m_refData)
-    return FALSE;
+    if (!m_refData)
+        return false;

 
 

-       if (!dc->Ok() )
-               return FALSE;
-               
-       {
-               wxMacPortSetter helper( dc ) ;
-               PicHandle pict = GetHMETAFILE() ;
-               DrawPicture( pict , &(**pict).picFrame ) ;
-       }
-    return TRUE;
+    if (!dc->Ok() )
+        return false;
+
+    {
+#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() ;
+        wxMacPortSetter helper( dc ) ;
+        DrawPicture( pict , &(**pict).picFrame ) ;
+#endif
+    }
+    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;

 }
 
 /*
 }
 
 /*


@@ -128,58 +200,71 @@ bool wxMetaFile::Play(wxDC *dc)
  *
  */
 
  *
  */
 

-// 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)
+// 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) )

 {
 {

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

 
 

-  wxASSERT_MSG( file.IsEmpty() , "no file based metafile support yet") ;
+    m_metaFile = new wxMetaFile(filename) ;
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+    Rect r={0,0,height,width} ;

 
 

-  m_metaFile = new wxMetaFile("") ;
-  Rect r={0,0,1000,1000} ;
-       
-  m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
-  ::GetPort( &m_macPort ) ;    
-  m_ok = TRUE ;
+    RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ;
+    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;

 
 

-  SetMapMode(wxMM_TEXT); 
+    m_metaFile->SetHMETAFILE( (WXHMETAFILE) OpenPicture( &r ) ) ;
+    ::GetPort( (GrafPtr*) &m_macPort ) ;
+    m_ok = true ;
+#endif
+    SetMapMode(wxMM_TEXT);

 }
 
 }
 

-// New constructor that takes origin and extent. If you use this, don't
-// give origin/extent arguments to wxMakeMetaFilePlaceable.
+wxMetaFileDC::~wxMetaFileDC()
+{
+}

 
 

-wxMetaFileDC::wxMetaFileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
+void wxMetaFileDC::DoGetSize(int *width, int *height) const

 {
 {

-  m_minX = 10000;
-  m_minY = 10000;
-  m_maxX = -10000;
-  m_maxY = -10000;
+    wxCHECK_RET( m_metaFile , _T("GetSize() doesn't work without a metafile") );

 
 

-  wxASSERT_MSG( file.IsEmpty() , "no file based metafile support yet") ;
+    wxSize sz = m_metaFile->GetSize() ;
+    if (width) (*width) = sz.x;
+    if (height) (*height) = sz.y;
+}

 
 

-       m_metaFile = new wxMetaFile("") ;
-       Rect r={yorg,xorg,yorg+yext,xorg+xext} ;
-       
-       m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
-       ::GetPort( &m_macPort ) ;       
-  m_ok = TRUE ;
+wxMetaFile *wxMetaFileDC::Close()
+{
+    ClosePicture() ;
+    return m_metaFile;
+}

 
 

-  SetMapMode(wxMM_TEXT); 
+#if wxUSE_DATAOBJ
+size_t wxMetafileDataObject::GetDataSize() const
+{
+    return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ;

 }
 
 }
 

-wxMetaFileDC::~wxMetaFileDC()
+bool wxMetafileDataObject::GetDataHere(void *buf) const

 {
 {

+    memcpy( buf , (*(PicHandle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE()) ,
+        GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ) ;
+    return true ;

 }
 
 }
 

-wxMetaFile *wxMetaFileDC::Close()
+bool wxMetafileDataObject::SetData(size_t len, const void *buf)

 {
 {

-       ClosePicture() ;
-       return m_metaFile;
+    Handle handle = NewHandle( len ) ;
+    SetHandleSize( handle , len ) ;
+    memcpy( *handle , buf , len ) ;
+    m_metafile.SetHMETAFILE( (WXHMETAFILE) handle ) ;
+    return true ;

 }
 }

+#endif

 
 #endif
 
 #endif