projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure that wxToolBar has one of wxTB_TOP/LEFT/RIGHT/BOTTOM styles set, otherwise...
[wxWidgets.git]
/
src
/
mac
/
carbon
/
dataobj.cpp
diff --git
a/src/mac/carbon/dataobj.cpp
b/src/mac/carbon/dataobj.cpp
index cc1c3522069fe596eefa075a3d2b2ca260678705..fb73241ed9b61dcc8d2c81742c579ac3e49fadcc 100644
(file)
--- a/
src/mac/carbon/dataobj.cpp
+++ b/
src/mac/carbon/dataobj.cpp
@@
-311,8
+311,10
@@
void wxBitmapDataObject::Clear()
{
if (m_pictHandle != NULL)
{
{
if (m_pictHandle != NULL)
{
+#ifndef __LP64__
if (m_pictCreated)
KillPicture( (PicHandle)m_pictHandle );
if (m_pictCreated)
KillPicture( (PicHandle)m_pictHandle );
+#endif
m_pictHandle = NULL;
}
m_pictHandle = NULL;
}
@@
-356,16
+358,21
@@
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;
+#ifndef __LP64__
Rect frame;
wxMacGetPictureBounds( picHandle, &frame );
Rect frame;
wxMacGetPictureBounds( picHandle, &frame );
-
+#if wxUSE_METAFILE
wxMetafile mf;
mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle );
wxMetafile mf;
mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle );
+#endif
wxMemoryDC mdc;
m_bitmap.Create( frame.right - frame.left, frame.bottom - frame.top );
mdc.SelectObject( m_bitmap );
wxMemoryDC mdc;
m_bitmap.Create( frame.right - frame.left, frame.bottom - frame.top );
mdc.SelectObject( m_bitmap );
+#if wxUSE_METAFILE
mf.Play( &mdc );
mf.Play( &mdc );
+#endif
mdc.SelectObject( wxNullBitmap );
mdc.SelectObject( wxNullBitmap );
+#endif
return m_bitmap.Ok();
}
return m_bitmap.Ok();
}