intel pict fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-03-17 10:39:56 +00:00
parent 611ac06b89
commit 1cf9b41c2d
2 changed files with 6 additions and 3 deletions

View File

@@ -342,7 +342,8 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
// ownership is transferred to the bitmap // ownership is transferred to the bitmap
m_pictCreated = false; m_pictCreated = false;
Rect frame = (**picHandle).picFrame; Rect frame ;
wxMacGetPictureBounds( picHandle , &frame ) ;
wxMetafile mf; wxMetafile mf;
mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle ); mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle );

View File

@@ -178,7 +178,8 @@ bool wxMetaFile::Play(wxDC *dc)
#else #else
PicHandle pict = (PicHandle) GetHMETAFILE(); PicHandle pict = (PicHandle) GetHMETAFILE();
wxMacPortSetter helper( dc ); 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() ) if ( Ok() )
{ {
PicHandle pict = (PicHandle) GetHMETAFILE() ; PicHandle pict = (PicHandle) GetHMETAFILE() ;
Rect &r = (**pict).picFrame ; Rect r ;
wxMacGetPictureBounds( pict , &r ) ;
size.x = r.right - r.left ; size.x = r.right - r.left ;
size.y = r.bottom - r.top ; size.y = r.bottom - r.top ;
} }