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

don't modify all wxBitmaps sharing the same wxBitmapRefData when SetMask() is called

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-23 18:52:18 +00:00
parent 6726a6b097
commit 7ff64980aa
3 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/msw/bitmap.cpp
View File

@@ -67,6 +67,7 @@ class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
{
public:
wxBitmapRefData();
wxBitmapRefData(const wxBitmapRefData& data);
virtual ~wxBitmapRefData() { Free(); }
virtual void Free();
@@ -120,7 +121,9 @@ private:
// optional mask for transparent drawing
wxMask *m_bitmapMask;
DECLARE_NO_COPY_CLASS(wxBitmapRefData)
// not implemented
wxBitmapRefData& operator=(const wxBitmapRefData&);
};
// ----------------------------------------------------------------------------
@@ -200,6 +203,23 @@ wxBitmapRefData::wxBitmapRefData()
m_hasAlpha = FALSE;
}
wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
: wxGDIImageRefData(data)
{
#ifdef __WXDEBUG__
m_selectedInto = NULL;
#endif
// can't copy the mask as the other bitmap destroys it
m_bitmapMask = NULL;
wxASSERT_MSG( !data.m_isDIB,
_T("can't copy bitmap locked for raw access!") );
m_isDIB = FALSE;
m_hasAlpha = data.m_hasAlpha;
}
void wxBitmapRefData::Free()
{
wxASSERT_MSG( !m_selectedInto,
@@ -236,6 +256,28 @@ wxGDIImageRefData *wxBitmap::CreateData() const
return new wxBitmapRefData;
}
wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *dataOrig) const
{
const wxBitmapRefData *
data = wx_static_cast(const wxBitmapRefData *, dataOrig);
if ( !data )
return NULL;
wxBitmap *self = wx_const_cast(wxBitmap *, this);
self->m_refData = new wxBitmapRefData(*data);
#if wxUSE_WXDIB
// copy the other bitmap
if ( data->m_hBitmap )
{
wxDIB dib((HBITMAP)(data->m_hBitmap));
self->CopyFromDIB(dib);
}
#endif // wxUSE_WXDIB
return m_refData;
}
#ifdef __WIN32__
bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
@@ -1094,7 +1136,7 @@ void wxBitmap::SetSelectedInto(wxDC *dc)
void wxBitmap::SetPalette(const wxPalette& palette)
{
EnsureHasData();
AllocExclusive();
GetBitmapData()->m_bitmapPalette = palette;
}
@@ -1103,7 +1145,7 @@ void wxBitmap::SetPalette(const wxPalette& palette)
void wxBitmap::SetMask(wxMask *mask)
{
EnsureHasData();
AllocExclusive();
GetBitmapData()->SetMask(mask);
}