X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..18caa1e963269d02499b327bb4e7cc2ac48fd67e:/src/os2/bitmap.cpp diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 8b3dbb8fea..a565c74f17 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -27,6 +27,7 @@ #include "wx/image.h" #endif +#include "wx/os2/dc.h" #include "wx/os2/private.h" #include "wx/xpmdecod.h" @@ -94,11 +95,6 @@ void wxBitmapRefData::Free() // wxBitmap creation // ---------------------------------------------------------------------------- -wxGDIRefData* wxBitmap::CreateGDIRefData() const -{ - return new wxBitmapRefData; -} - wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const { return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data)); @@ -933,9 +929,12 @@ wxImage wxBitmap::ConvertToImage() const // // May already be selected into a PS // - if ((pDC = GetSelectedInto()) != NULL) + pDC = GetSelectedInto(); + const wxPMDCImpl *impl; + if (pDC != NULL && + (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL) { - hPSMem = pDC->GetHPS(); + hPSMem = impl->GetHPS(); } else {