Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding metafile and clipboard support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-13 05:59:04 +00:00
parent 79c5fe4be8
commit 71cc158eaa
7 changed files with 193 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mac/carbon/dataobj.cpp
View File

@@ -32,6 +32,7 @@
#include "wx/dataobj.h"
#include "wx/mstream.h"
#include "wx/image.h"
#include "wx/metafile.h"
#include "wx/mac/private.h"
#include <Scrap.h>
@@ -250,9 +251,8 @@ wxBitmapDataObject::wxBitmapDataObject(
Init();
if ( m_bitmap.Ok() )
{
/*
m_pictHandle = m_bitmap.GetBitmapData()->GetPict( &m_pictCreated ) ;
*/
m_pictHandle = wxMacCreatePicHandle( rBitmap ) ;
m_pictCreated = true ;
}
}
@@ -269,9 +269,8 @@ void wxBitmapDataObject::SetBitmap(
wxBitmapDataObjectBase::SetBitmap(rBitmap);
if ( m_bitmap.Ok() )
{
/*
m_pictHandle = m_bitmap.GetBitmapData()->GetPict( &m_pictCreated ) ;
*/
m_pictHandle = wxMacCreatePicHandle( rBitmap ) ;
m_pictCreated = true ;
}
}
@@ -320,10 +319,14 @@ bool wxBitmapDataObject::SetData(
// ownership is transferred to the bitmap
m_pictCreated = false ;
Rect frame = (**picHandle).picFrame ;
/*
m_bitmap.GetBitmapData()->SetPict( (WXHMETAFILE) picHandle ) ;
m_bitmap.SetWidth( frame.right - frame.left ) ;
m_bitmap.SetHeight( frame.bottom - frame.top ) ;
*/
wxMetafile mf ;
mf.SetHMETAFILE( (WXHMETAFILE) m_pictHandle ) ;
wxMemoryDC mdc ;
m_bitmap.Create( frame.right - frame.left ,frame.bottom - frame.top ) ;
mdc.SelectObject(m_bitmap ) ;
mf.Play( &mdc ) ;
mdc.SelectObject( wxNullBitmap ) ;
return m_bitmap.Ok();
}