intel pict fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index e216ad588751f765004c05fd02b11a9a19c91b08..dd1ab8a38d6a0b142792ea55c497983fe0b3e755 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -342,7 +342,8 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
 
     // ownership is transferred to the bitmap
     m_pictCreated = false;
 
     // ownership is transferred to the bitmap
     m_pictCreated = false;

-    Rect frame = (**picHandle).picFrame;
+    Rect frame ;
+    wxMacGetPictureBounds( picHandle , &frame ) ;

 
     wxMetafile mf;
     mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle );
 
     wxMetafile mf;
     mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle );

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 2aabd1d709286b86933a1eb562228a9a5ec32fac..ef560d445d5277095452cdf2cc82727cc68c594e 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -178,7 +178,8 @@ bool wxMetaFile::Play(wxDC *dc)
 #else
         PicHandle pict = (PicHandle) GetHMETAFILE();
         wxMacPortSetter helper( dc );
 #else
         PicHandle pict = (PicHandle) GetHMETAFILE();
         wxMacPortSetter helper( dc );

-        DrawPicture( pict , &(**pict).picFrame );
+        Rect picFrame ;
+        DrawPicture( pict , wxMacGetPictureBounds( pict , &picFrame ) );

 #endif
     }
 
 #endif
     }
 


@@ -192,7 +193,8 @@ wxSize wxMetaFile::GetSize() const
     if ( Ok() )
     {
         PicHandle pict = (PicHandle) GetHMETAFILE() ;
     if ( Ok() )
     {
         PicHandle pict = (PicHandle) GetHMETAFILE() ;

-        Rect &r = (**pict).picFrame ;
+        Rect r ;
+        wxMacGetPictureBounds( pict , &r ) ;

         size.x = r.right - r.left ;
         size.y = r.bottom - r.top ;
     }
         size.x = r.right - r.left ;
         size.y = r.bottom - r.top ;
     }