allowing shaped windows again

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 1d38499628de470f00b9488c32395e96459b85c7..594fe43af521d1ef1aa85c16369595d50d35ed88 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -61,7 +61,7 @@ wxMetafileRefData::~wxMetafileRefData(void)
 {
     if (m_metafile)
     {
-               KillPicture( (PicHandle) m_metafile ) ;
+        KillPicture( (PicHandle) m_metafile ) ;
         m_metafile = 0;
     }
 }
@@ -72,7 +72,7 @@ wxMetaFile::wxMetaFile(const wxString& file)
 
 
     M_METAFILEDATA->m_metafile = 0;
-    wxASSERT_MSG( file.IsEmpty() , "no file based metafile support yet") ;
+    wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ;
 /*
     if (!file.IsNull() && (file.Cmp("") == 0))
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
@@ -86,10 +86,10 @@ wxMetaFile::~wxMetaFile()
 bool wxMetaFile::SetClipboard(int width, int height)
 {
 #if wxUSE_DRAG_AND_DROP
-//TODO finishi this port , we need the data obj first
+    //TODO finishi this port , we need the data obj first
     if (!m_refData)
         return FALSE;
-
+    
     bool alreadyOpen=wxTheClipboard->IsOpened() ;
     if (!alreadyOpen)
     {
@@ -97,11 +97,11 @@ bool wxMetaFile::SetClipboard(int width, int height)
         wxTheClipboard->Clear();
     }
     wxDataObject *data =
-      new wxMetafileDataObject( *this) ;
+        new wxMetafileDataObject( *this) ;
     bool success = wxTheClipboard->SetData(data);
     if (!alreadyOpen) 
-      wxTheClipboard->Close();
-           return (bool) success;
+        wxTheClipboard->Close();
+    return (bool) success;
 #endif
     return TRUE ;
 }
@@ -110,104 +110,109 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 {
     if (!m_refData)
         m_refData = new wxMetafileRefData;
+    if ( M_METAFILEDATA->m_metafile )
+        KillPicture( (PicHandle) M_METAFILEDATA->m_metafile ) ;
 
     M_METAFILEDATA->m_metafile = mf;
 }
 
 bool wxMetaFile::Play(wxDC *dc)
 {
-  if (!m_refData)
-    return FALSE;
-
-       if (!dc->Ok() )
-               return FALSE;
-               
-       {
-               wxMacPortSetter helper( dc ) ;
-               PicHandle pict = (PicHandle) GetHMETAFILE() ;
-               DrawPicture( pict , &(**pict).picFrame ) ;
-       }
+    if (!m_refData)
+        return FALSE;
+    
+    if (!dc->Ok() )
+        return FALSE;
+        
+    {
+        wxMacPortSetter helper( dc ) ;
+        PicHandle pict = (PicHandle) GetHMETAFILE() ;
+        DrawPicture( pict , &(**pict).picFrame ) ;
+    }
     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
  *
  */
 
-// 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() , "no file based metafile support yet") ;
-
-  m_metaFile = new wxMetaFile("") ;
-  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.
 
-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() , "no file based metafile support yet") ;
-
-       m_metaFile = new wxMetaFile("") ;
-       Rect r={yorg,xorg,yorg+yext,xorg+xext} ;
-       
-       m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
-       ::GetPort( (GrafPtr*) &m_macPort ) ;    
-  m_ok = TRUE ;
-
-  SetMapMode(wxMM_TEXT); 
+    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(filename) ;
+    Rect r={0,0,height,width} ;
+    
+    RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ;
+    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
+
+    m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
+    ::GetPort( (GrafPtr*) &m_macPort ) ;    
+    m_ok = TRUE ;
+    
+    SetMapMode(wxMM_TEXT); 
 }
 
 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() ;
-       return m_metaFile;
+    ClosePicture() ;
+    return m_metaFile;
 }
 
 #if wxUSE_DATAOBJ
 size_t wxMetafileDataObject::GetDataSize() const
 {
-  return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ;
+    return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ;
 }
 
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {
-  memcpy( buf , (*(PicHandle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE()) ,
-    GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ) ;
-  return true ;
+    memcpy( buf , (*(PicHandle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE()) ,
+        GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ) ;
+    return true ;
 }
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {
-  Handle handle = (Handle) m_metafile.GetHMETAFILE() ;
-  SetHandleSize( handle , len ) ;
-  memcpy( *handle , buf , len ) ;
-  return true ;
+    Handle handle = NewHandle( len ) ;
+    SetHandleSize( handle , len ) ;
+    memcpy( *handle , buf , len ) ;
+    m_metafile.SetHMETAFILE( handle ) ;
+    return true ;
 }
 #endif