Added m_ prefix to wxColourData and wxFontData members for consistency.

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index fc6c64b825e3a284dfa572c6b0c6d921cd4041f7..aca4bc0ae5b233e18a9c5c17177a2da896b1cda2 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        metafile.cpp
 // Purpose:     wxMetaFile, wxMetaFileDC etc. These classes are optional.
 /////////////////////////////////////////////////////////////////////////////
 // Name:        metafile.cpp
 // Purpose:     wxMetaFile, wxMetaFileDC etc. These classes are optional.

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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;
     }
 }


@@ -70,7 +72,7 @@ wxMetaFile::wxMetaFile(const wxString& file)
 
 
     M_METAFILEDATA->m_metafile = 0;
 
 
     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);
 /*
     if (!file.IsNull() && (file.Cmp("") == 0))
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);


@@ -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();
-           return (bool) success;
-
+    wxDataObject *data =
+        new wxMetafileDataObject( *this) ;
+    bool success = wxTheClipboard->SetData(data);
+    if (!alreadyOpen) 
+        wxTheClipboard->Close();
+    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;


@@ -109,29 +116,17 @@ void wxMetafile::SetHMETAFILE(PicHandle mf)
 
 bool wxMetaFile::Play(wxDC *dc)
 {
 
 bool wxMetaFile::Play(wxDC *dc)
 {

-  if (!m_refData)
-    return FALSE;
-
-       if (!dc->Ok() )
-               return FALSE;
-               
-       dc->MacVerifySetup() ;
-       
-       {
-               PicHandle pict = GetHMETAFILE() ;
-               DrawPicture( pict , &(**pict).picFrame ) ;
-       }
-/*

     if (!m_refData)
         return FALSE;
     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();
-*/
+    
+    if (!dc->Ok() )
+        return FALSE;
+        
+    {
+        wxMacPortSetter helper( dc ) ;
+        PicHandle pict = (PicHandle) GetHMETAFILE() ;
+        DrawPicture( pict , &(**pict).picFrame ) ;
+    }

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -144,22 +139,22 @@ bool wxMetaFile::Play(wxDC *dc)
 // *DO* give origin/extent arguments to wxMakeMetaFilePlaceable.
 wxMetaFileDC::wxMetaFileDC(const wxString& file)
 {
 // *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( &m_macPort ) ;    
-  m_ok = TRUE ;
-
-  SetMapMode(wxMM_TEXT); 
+    m_metaFile = NULL;
+    m_minX = 10000;
+    m_minY = 10000;
+    m_maxX = -10000;
+    m_maxY = -10000;
+    
+    wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ;
+    
+    m_metaFile = new wxMetaFile(wxEmptyString) ;
+    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
 }
 
 // New constructor that takes origin and extent. If you use this, don't


@@ -167,31 +162,53 @@ wxMetaFileDC::wxMetaFileDC(const wxString& file)
 
 wxMetaFileDC::wxMetaFileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
 {
 
 wxMetaFileDC::wxMetaFileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
 {

-  m_minX = 10000;
-  m_minY = 10000;
-  m_maxX = -10000;
-  m_maxY = -10000;
+    m_minX = 10000;
+    m_minY = 10000;
+    m_maxX = -10000;
+    m_maxY = -10000;
+    
+    wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet")) ;
+    
+    m_metaFile = new wxMetaFile(wxEmptyString) ;
+    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( file.IsEmpty() , "no file based metafile support yet") ;
+wxMetaFileDC::~wxMetaFileDC()
+{
+}

 
 

-       m_metaFile = new wxMetaFile("") ;
-       Rect r={yorg,xorg,yorg+yext,xorg+xext} ;
-       
-       m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
-       ::GetPort( &m_macPort ) ;       
-  m_ok = TRUE ;
+wxMetaFile *wxMetaFileDC::Close()
+{
+    ClosePicture() ;
+    return m_metaFile;
+}

 
 

-  SetMapMode(wxMM_TEXT); 
+#if wxUSE_DATAOBJ
+size_t wxMetafileDataObject::GetDataSize() const
+{
+    return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ;

 }
 
 }
 

-wxMetaFileDC::~wxMetaFileDC()
+bool wxMetafileDataObject::GetDataHere(void *buf) const

 {
 {

+    memcpy( buf , (*(PicHandle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE()) ,
+        GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ) ;
+    return true ;

 }
 
 }
 

-wxMetaFile *wxMetaFileDC::Close()
+bool wxMetafileDataObject::SetData(size_t len, const void *buf)

 {
 {

-       ClosePicture() ;
-       return m_metaFile;
+    Handle handle = (Handle) m_metafile.GetHMETAFILE() ;
+    SetHandleSize( handle , len ) ;
+    memcpy( *handle , buf , len ) ;
+    return true ;

 }
 }

+#endif

 
 #endif
 
 #endif