Fix wxListCtrl background colour bug Part I

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index fc6c64b825e3a284dfa572c6b0c6d921cd4041f7..2380c96edcedf45d568bad2eee267162c7933990 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -34,6 +34,8 @@
 #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>
 
 #include <stdio.h>
 #include <string.h>
 


@@ -59,7 +61,7 @@ wxMetafileRefData::~wxMetafileRefData(void)
 {
     if (m_metafile)
     {
 {
     if (m_metafile)
     {

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

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


@@ -83,23 +85,28 @@ 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();
+        wxTheClipboard->Clear();

     }
     }

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

            return (bool) success;
            return (bool) success;

-
+#endif

     return TRUE ;
 }
 
     return TRUE ;
 }
 

-void wxMetafile::SetHMETAFILE(PicHandle mf)
+void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)

 {
     if (!m_refData)
         m_refData = new wxMetafileRefData;
 {
     if (!m_refData)
         m_refData = new wxMetafileRefData;


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

-       dc->MacVerifySetup() ;
-       

        {
        {

-               PicHandle pict = GetHMETAFILE() ;
+               wxMacPortSetter helper( dc ) ;
+               PicHandle pict = (PicHandle) GetHMETAFILE() ;

                DrawPicture( pict , &(**pict).picFrame ) ;
        }
                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;
 }
 


@@ -156,7 +151,7 @@ wxMetaFileDC::wxMetaFileDC(const wxString& file)
   Rect r={0,0,1000,1000} ;
        
   m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
   Rect r={0,0,1000,1000} ;
        
   m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;

-  ::GetPort( &m_macPort ) ;    
+  ::GetPort( (GrafPtr*) &m_macPort ) ; 

   m_ok = TRUE ;
 
   SetMapMode(wxMM_TEXT); 
   m_ok = TRUE ;
 
   SetMapMode(wxMM_TEXT); 


@@ -178,7 +173,7 @@ wxMetaFileDC::wxMetaFileDC(const wxString& file, int xext, int yext, int xorg, i
        Rect r={yorg,xorg,yorg+yext,xorg+xext} ;
        
        m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
        Rect r={yorg,xorg,yorg+yext,xorg+xext} ;
        
        m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;

-       ::GetPort( &m_macPort ) ;       
+       ::GetPort( (GrafPtr*) &m_macPort ) ;    

   m_ok = TRUE ;
 
   SetMapMode(wxMM_TEXT); 
   m_ok = TRUE ;
 
   SetMapMode(wxMM_TEXT); 


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

+#if wxUSE_DATAOBJ
+size_t wxMetafileDataObject::GetDataSize() const
+{
+  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 ;
+}
+
+bool wxMetafileDataObject::SetData(size_t len, const void *buf)
+{
+  Handle handle = (Handle) m_metafile.GetHMETAFILE() ;
+  SetHandleSize( handle , len ) ;
+  memcpy( *handle , buf , len ) ;
+  return true ;
+}
+#endif
+

 #endif
 #endif