added calls for invalidating the dc setup on mac explicitely (needed in case of neste...

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 97e31948bf9db3a05d19b4190b481f2cec35de83..fc6c64b825e3a284dfa572c6b0c6d921cd4041f7 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -59,7 +59,7 @@ wxMetafileRefData::~wxMetafileRefData(void)
 {
     if (m_metafile)
     {
 {
     if (m_metafile)
     {

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

         m_metafile = 0;
     }
 }
         m_metafile = 0;
     }
 }


@@ -85,7 +85,7 @@ bool wxMetaFile::SetClipboard(int width, int height)
 {
     if (!m_refData)
         return FALSE;
 {
     if (!m_refData)
         return FALSE;

-/*
+

     bool alreadyOpen=wxClipboardOpen();
     if (!alreadyOpen)
     {
     bool alreadyOpen=wxClipboardOpen();
     if (!alreadyOpen)
     {


@@ -94,11 +94,19 @@ bool wxMetaFile::SetClipboard(int width, int height)
     }
     bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
     if (!alreadyOpen) wxCloseClipboard();
     }
     bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
     if (!alreadyOpen) wxCloseClipboard();

-    return (bool) success;
-    */
+           return (bool) success;
+

     return TRUE ;
 }
 
     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)
 bool wxMetaFile::Play(wxDC *dc)
 {
   if (!m_refData)


@@ -144,11 +152,11 @@ wxMetaFileDC::wxMetaFileDC(const wxString& file)
 
   wxASSERT_MSG( file.IsEmpty() , "no file based metafile support yet") ;
 
 
   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); 
   m_ok = TRUE ;
 
   SetMapMode(wxMM_TEXT); 


@@ -186,5 +194,4 @@ wxMetaFile *wxMetaFileDC::Close()
        return m_metaFile;
 }
 
        return m_metaFile;
 }
 

-

 #endif
 #endif