From 7b24e97518267b4e6e3a803d69b05dd40606619c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 29 Jul 2004 09:39:52 +0000 Subject: [PATCH] fix for assert when copying bitmap in CloneRefData() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/bitmap.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 5fbb33b963..a68457e219 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -264,7 +264,6 @@ wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *dataOrig) const return NULL; wxBitmap *self = wx_const_cast(wxBitmap *, this); - self->m_refData = new wxBitmapRefData(*data); #if wxUSE_WXDIB // copy the other bitmap @@ -273,7 +272,12 @@ wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *dataOrig) const wxDIB dib((HBITMAP)(data->m_hBitmap)); self->CopyFromDIB(dib); } + else #endif // wxUSE_WXDIB + { + // don't copy the bitmap data, but do copy the size, depth, ... + self->m_refData = new wxBitmapRefData(*data); + } return m_refData; } -- 2.45.2