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

changed implementation (was using now removed methods)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-03-28 14:26:38 +00:00
parent d5309f5803
commit c309daf5d3
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,7 @@ bool wxBitmapDataObject::SetData(
return FALSE; return FALSE;
} }
m_bitmap = vImage.ConvertToBitmap(); m_bitmap = wxBitmap( vImage ) ;
return m_bitmap.Ok(); return m_bitmap.Ok();
} }
@@ -290,17 +290,18 @@ void wxBitmapDataObject::DoConvertToPng()
if (!m_bitmap.Ok()) if (!m_bitmap.Ok())
return; return;
wxImage vImage(m_bitmap); wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
wxPNGHandler vHandler; wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
wxCountingOutputStream vCount;
vHandler.SaveFile(&vImage, vCount); wxImage image = m_bitmap.ConvertToImage();
m_pngSize = vCount.GetSize() + 100; // sometimes the size seems to vary ??? wxCountingOutputStream count;
image.SaveFile(count, wxBITMAP_TYPE_PNG);
m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
m_pngData = malloc(m_pngSize); m_pngData = malloc(m_pngSize);
wxMemoryOutputStream vMstream((char*) m_pngData, m_pngSize); wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize);
image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
vHandler.SaveFile(&vImage, vMstream );
} }

19
src/mac/dataobj.cpp
View File

@@ -281,7 +281,7 @@ bool wxBitmapDataObject::SetData(
return FALSE; return FALSE;
} }
m_bitmap = vImage.ConvertToBitmap(); m_bitmap = wxBitmap( vImage ) ;
return m_bitmap.Ok(); return m_bitmap.Ok();
} }
@@ -290,17 +290,18 @@ void wxBitmapDataObject::DoConvertToPng()
if (!m_bitmap.Ok()) if (!m_bitmap.Ok())
return; return;
wxImage vImage(m_bitmap); wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
wxPNGHandler vHandler; wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
wxCountingOutputStream vCount;
vHandler.SaveFile(&vImage, vCount); wxImage image = m_bitmap.ConvertToImage();
m_pngSize = vCount.GetSize() + 100; // sometimes the size seems to vary ??? wxCountingOutputStream count;
image.SaveFile(count, wxBITMAP_TYPE_PNG);
m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
m_pngData = malloc(m_pngSize); m_pngData = malloc(m_pngSize);
wxMemoryOutputStream vMstream((char*) m_pngData, m_pngSize); wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize);
image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
vHandler.SaveFile(&vImage, vMstream );
} }