added generic color dialog to setup

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index fc6c64b825e3a284dfa572c6b0c6d921cd4041f7..9d3d1576b79090c47b23a787838c2711e9da3eee 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -83,19 +83,21 @@ wxMetaFile::~wxMetaFile()
 
 bool wxMetaFile::SetClipboard(int width, int height)
 {
 
 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;
 
     if (!m_refData)
         return FALSE;
 

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

     if (!alreadyOpen)
     {
     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;
     }
     bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
     if (!alreadyOpen) wxCloseClipboard();
            return (bool) success;

-
+#endif

     return TRUE ;
 }
 
     return TRUE ;
 }
 


@@ -115,23 +117,11 @@ bool wxMetaFile::Play(wxDC *dc)
        if (!dc->Ok() )
                return FALSE;
                
        if (!dc->Ok() )
                return FALSE;
                

-       dc->MacVerifySetup() ;
-       

        {
        {

+               wxMacPortSetter helper( dc ) ;

                PicHandle pict = GetHMETAFILE() ;
                DrawPicture( pict , &(**pict).picFrame ) ;
        }
                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;
 }
 
     return TRUE;
 }