fixed memory leak and optimized GetSubBitmap (Kudos to Eric Lavigne)

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 5742ba4ce62e1148ccf4f8e04818a9df9c898d65..9d3d1576b79090c47b23a787838c2711e9da3eee 100644 (file)
--- 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