cleanup for 10.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -311,8 +311,10 @@ void wxBitmapDataObject::Clear()
|
||||
{
|
||||
if (m_pictHandle != NULL)
|
||||
{
|
||||
#ifndef __LP64__
|
||||
if (m_pictCreated)
|
||||
KillPicture( (PicHandle)m_pictHandle );
|
||||
#endif
|
||||
m_pictHandle = NULL;
|
||||
}
|
||||
|
||||
@@ -356,6 +358,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
|
||||
|
||||
// ownership is transferred to the bitmap
|
||||
m_pictCreated = false;
|
||||
#ifndef __LP64__
|
||||
Rect frame;
|
||||
wxMacGetPictureBounds( picHandle, &frame );
|
||||
|
||||
@@ -366,6 +369,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
|
||||
mdc.SelectObject( m_bitmap );
|
||||
mf.Play( &mdc );
|
||||
mdc.SelectObject( wxNullBitmap );
|
||||
#endif
|
||||
|
||||
return m_bitmap.Ok();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user