fixed compilation problem in pror commit

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 6aff3b7d386bfa1ff3a982966b93a945960ba98b..2aabd1d709286b86933a1eb562228a9a5ec32fac 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -9,11 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "metafile.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -23,61 +18,62 @@
 #if wxUSE_METAFILE
 
 #ifndef WX_PRECOMP
 #if wxUSE_METAFILE
 
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"

 #endif
 
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #endif
 
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"

-

 #include "wx/mac/private.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include "wx/mac/private.h"
 
 #include <stdio.h>
 #include <string.h>
 

-extern bool wxClipboardIsOpen;
-

 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 
 class wxMetafileRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxMetafile;
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 
 class wxMetafileRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxMetafile;

+

 public:
 public:

-    wxMetafileRefData(void);
-    ~wxMetafileRefData(void);
+    wxMetafileRefData();
+    ~wxMetafileRefData();

 
 private:
     PicHandle m_metafile;
 
 private:
     PicHandle m_metafile;

+

 #if wxMAC_USE_CORE_GRAPHICS
 #if wxMAC_USE_CORE_GRAPHICS

-    QDPictRef m_qdPictRef ;
+    QDPictRef m_qdPictRef;

 #endif
 };
 
 #endif
 };
 

+extern bool wxClipboardIsOpen;
+

 
 

-/*
- * Metafiles
- * Currently, the only purpose for making a metafile is to put
- * it on the clipboard.
- */
+// Metafiles:
+// Currently, the only purpose for making a metafile
+// is to put it on the clipboard.

 
 

-wxMetafileRefData::wxMetafileRefData(void)
+wxMetafileRefData::wxMetafileRefData()

 {
     m_metafile = 0;
 {
     m_metafile = 0;

+

 #if wxMAC_USE_CORE_GRAPHICS
 #if wxMAC_USE_CORE_GRAPHICS

-    m_qdPictRef = NULL ;
+    m_qdPictRef = NULL;

 #endif
 }
 
 #endif
 }
 

-wxMetafileRefData::~wxMetafileRefData(void)
+wxMetafileRefData::~wxMetafileRefData()

 {
     if (m_metafile)
     {
 {
     if (m_metafile)
     {

-        KillPicture( (PicHandle) m_metafile ) ;
-        m_metafile = 0;
+        KillPicture( (PicHandle)m_metafile );
+        m_metafile = NULL;
+

 #if wxMAC_USE_CORE_GRAPHICS
 #if wxMAC_USE_CORE_GRAPHICS

-        QDPictRelease( m_qdPictRef ) ;
-        m_qdPictRef = NULL ;
+        QDPictRelease( m_qdPictRef );
+        m_qdPictRef = NULL;

 #endif
     }
 }
 #endif
     }
 }


@@ -87,11 +83,12 @@ wxMetaFile::wxMetaFile(const wxString& file)
     m_refData = new wxMetafileRefData;
 
     M_METAFILEDATA->m_metafile = 0;
     m_refData = new wxMetafileRefData;
 
     M_METAFILEDATA->m_metafile = 0;

-    wxASSERT_MSG( file.empty() , wxT("no file based metafile support yet") ) ;
-/*
+    wxASSERT_MSG( file.empty(), wxT("no file based metafile support yet") );
+
+#if 0

     if (!file.IsNull() && (file.Cmp("") == 0))
     if (!file.IsNull() && (file.Cmp("") == 0))

-        M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
-*/
+        M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile( file );
+#endif

 }
 
 wxMetaFile::~wxMetaFile()
 }
 
 wxMetaFile::~wxMetaFile()


@@ -113,19 +110,19 @@ bool wxMetaFile::SetClipboard(int width, int height)
     bool success = true;
 
 #if wxUSE_DRAG_AND_DROP
     bool success = true;
 
 #if wxUSE_DRAG_AND_DROP

-    //TODO finishi this port , we need the data obj first
+    // TODO: to finish this port, we need the data obj first

     if (!m_refData)
         return false;
 
     if (!m_refData)
         return false;
 

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

     if (!alreadyOpen)
     {
         wxTheClipboard->Open();
         wxTheClipboard->Clear();
     }
     if (!alreadyOpen)
     {
         wxTheClipboard->Open();
         wxTheClipboard->Clear();
     }

-    wxDataObject *data =
-        new wxMetafileDataObject( *this) ;
-    success = wxTheClipboard->SetData(data);
+
+    wxDataObject *data = new wxMetafileDataObject( *this );
+    success = wxTheClipboard->SetData( data );

     if (!alreadyOpen)
         wxTheClipboard->Close();
 #endif
     if (!alreadyOpen)
         wxTheClipboard->Close();
 #endif


@@ -135,24 +132,26 @@ bool wxMetaFile::SetClipboard(int width, int height)
 
 void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 {
 
 void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 {

-    UnRef() ;
+    UnRef();

 
     m_refData = new wxMetafileRefData;
 
     M_METAFILEDATA->m_metafile = (PicHandle) mf;
 
     m_refData = new wxMetafileRefData;
 
     M_METAFILEDATA->m_metafile = (PicHandle) mf;

+

 #if wxMAC_USE_CORE_GRAPHICS
 #if wxMAC_USE_CORE_GRAPHICS

-    size_t sz = GetHandleSize( (Handle) M_METAFILEDATA->m_metafile ) ;
-    wxMemoryBuffer* membuf = new wxMemoryBuffer( sz ) ;
-    void * data = membuf->GetWriteBuf(sz) ;
-    memcpy( data , *M_METAFILEDATA->m_metafile , sz ) ;
-    membuf->UngetWriteBuf(sz) ;
-    CGDataProviderRef provider = CGDataProviderCreateWithData( membuf , data , sz ,
-        wxMacMemoryBufferReleaseProc ) ;
-    M_METAFILEDATA->m_qdPictRef = NULL ;
+    size_t sz = GetHandleSize( (Handle) M_METAFILEDATA->m_metafile );
+    wxMemoryBuffer* membuf = new wxMemoryBuffer( sz );
+    void *data = membuf->GetWriteBuf( sz );
+    memcpy( data, *M_METAFILEDATA->m_metafile, sz );
+    membuf->UngetWriteBuf( sz );
+    CGDataProviderRef provider = CGDataProviderCreateWithData(
+        membuf, data, sz, wxMacMemoryBufferReleaseProc );
+    M_METAFILEDATA->m_qdPictRef = NULL;
+

     if ( provider != NULL )
     {
     if ( provider != NULL )
     {

-        M_METAFILEDATA->m_qdPictRef = QDPictCreateWithProvider( provider ) ;
-        CGDataProviderRelease( provider ) ;
+        M_METAFILEDATA->m_qdPictRef = QDPictCreateWithProvider( provider );
+        CGDataProviderRelease( provider );

     }
 #endif
 }
     }
 #endif
 }


@@ -167,27 +166,29 @@ bool wxMetaFile::Play(wxDC *dc)
 
     {
 #if wxMAC_USE_CORE_GRAPHICS
 
     {
 #if wxMAC_USE_CORE_GRAPHICS

-        QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef ;
-        CGContextRef cg = ((wxMacCGContext*)(dc->GetGraphicContext()))->GetNativeContext() ;
-        CGRect bounds = QDPictGetBounds( cgPictRef ) ;
-
-        CGContextSaveGState(cg);
-        CGContextTranslateCTM(cg, 0 , bounds.size.width );
-        CGContextScaleCTM(cg, 1, -1);
-        QDPictDrawToCGContext( cg , bounds , cgPictRef ) ;
-        CGContextRestoreGState( cg ) ;
+        QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef;
+        CGContextRef cg = ((wxMacCGContext*)(dc->GetGraphicContext()))->GetNativeContext();
+        CGRect bounds = QDPictGetBounds( cgPictRef );
+
+        CGContextSaveGState( cg );
+        CGContextTranslateCTM( cg, 0 , bounds.size.width );
+        CGContextScaleCTM( cg, 1, -1 );
+        QDPictDrawToCGContext( cg , bounds, cgPictRef );
+        CGContextRestoreGState( cg );

 #else
 #else

-        PicHandle pict = (PicHandle) GetHMETAFILE() ;
-        wxMacPortSetter helper( dc ) ;
-        DrawPicture( pict , &(**pict).picFrame ) ;
+        PicHandle pict = (PicHandle) GetHMETAFILE();
+        wxMacPortSetter helper( dc );
+        DrawPicture( pict , &(**pict).picFrame );

 #endif
     }
 #endif
     }

+

     return true;
 }
 
 wxSize wxMetaFile::GetSize() const
 {
     wxSize size = wxDefaultSize ;
     return true;
 }
 
 wxSize wxMetaFile::GetSize() const
 {
     wxSize size = wxDefaultSize ;

+

     if ( Ok() )
     {
         PicHandle pict = (PicHandle) GetHMETAFILE() ;
     if ( Ok() )
     {
         PicHandle pict = (PicHandle) GetHMETAFILE() ;


@@ -199,10 +200,7 @@ wxSize wxMetaFile::GetSize() const
     return size;
 }
 
     return size;
 }
 

-/*
- * Metafile device context
- *
- */
+// Metafile device context

 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetaFilePlaceable.
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetaFilePlaceable.


@@ -211,22 +209,25 @@ wxMetaFileDC::wxMetaFileDC(const wxString& filename ,
                     int width , int height ,
                     const wxString& WXUNUSED(description) )
 {
                     int width , int height ,
                     const wxString& WXUNUSED(description) )
 {

-    wxASSERT_MSG( width == 0 || height == 0 , _T("no arbitration of metafilesize supported") ) ;
-    wxASSERT_MSG( filename.empty() , _T("no file based metafile support yet")) ;
+    wxASSERT_MSG( width == 0 || height == 0 , wxT("no arbitration of metafilesize supported") );
+    wxASSERT_MSG( filename.empty() , wxT("no file based metafile support yet"));
+
+    m_metaFile = new wxMetaFile( filename );

 
 

-    m_metaFile = new wxMetaFile(filename) ;

 #if wxMAC_USE_CORE_GRAPHICS
 #else
 #if wxMAC_USE_CORE_GRAPHICS
 #else

-    Rect r={0,0,height,width} ;
+    Rect r = { 0, 0, height, width };
+
+    RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r );
+    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn );

 
 

-    RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ;
-    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
+    m_metaFile->SetHMETAFILE( (WXHMETAFILE) OpenPicture( &r ) );
+    ::GetPort( (GrafPtr*) &m_macPort );

 
 

-    m_metaFile->SetHMETAFILE( (WXHMETAFILE) OpenPicture( &r ) ) ;
-    ::GetPort( (GrafPtr*) &m_macPort ) ;

     m_ok = true ;
 #endif
     m_ok = true ;
 #endif

-    SetMapMode(wxMM_TEXT);
+
+    SetMapMode( wxMM_TEXT );

 }
 
 wxMetaFileDC::~wxMetaFileDC()
 }
 
 wxMetaFileDC::~wxMetaFileDC()


@@ -235,38 +236,43 @@ wxMetaFileDC::~wxMetaFileDC()
 
 void wxMetaFileDC::DoGetSize(int *width, int *height) const
 {
 
 void wxMetaFileDC::DoGetSize(int *width, int *height) const
 {

-    wxCHECK_RET( m_metaFile , _T("GetSize() doesn't work without a metafile") );
+    wxCHECK_RET( m_metaFile , wxT("GetSize() doesn't work without a metafile") );

 
     wxSize sz = m_metaFile->GetSize() ;
 
     wxSize sz = m_metaFile->GetSize() ;

-    if (width) (*width) = sz.x;
-    if (height) (*height) = sz.y;
+    if (width)
+        (*width) = sz.x;
+    if (height)
+        (*height) = sz.y;

 }
 
 wxMetaFile *wxMetaFileDC::Close()
 {
     ClosePicture() ;
 }
 
 wxMetaFile *wxMetaFileDC::Close()
 {
     ClosePicture() ;

+

     return m_metaFile;
 }
 
 #if wxUSE_DATAOBJ
 size_t wxMetafileDataObject::GetDataSize() const
 {
     return m_metaFile;
 }
 
 #if wxUSE_DATAOBJ
 size_t wxMetafileDataObject::GetDataSize() const
 {

-    return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) ;
+    return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() );

 }
 
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {
     memcpy( buf , (*(PicHandle)(*((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 ;
+        GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) );
+
+    return true;

 }
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {
 }
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {

-    Handle handle = NewHandle( len ) ;
-    SetHandleSize( handle , len ) ;
-    memcpy( *handle , buf , len ) ;
-    m_metafile.SetHMETAFILE( (WXHMETAFILE) handle ) ;
+    Handle handle = NewHandle( len );
+    SetHandleSize( handle, len );
+    memcpy( *handle, buf, len );
+    m_metafile.SetHMETAFILE( (WXHMETAFILE) handle );
+

     return true ;
 }
 #endif
     return true ;
 }
 #endif