Added wxMemoryDC::SelectObjectAsSource() and make SelectObject() unshare
the bitmap to ensure that no other bitmaps are modified; also remove some code duplication by introducing wxMemoryDCBase (patch 1580745) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,15 +28,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
|
||||
// Memory DC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
|
||||
{
|
||||
CreateCompatible(NULL);
|
||||
Init();
|
||||
|
||||
if ( bitmap.IsOk() )
|
||||
SelectObject(bitmap);
|
||||
} // end of wxMemoryDC::wxMemoryDC
|
||||
|
||||
wxMemoryDC::wxMemoryDC(
|
||||
wxDC* pOldDC
|
||||
)
|
||||
@@ -121,7 +112,7 @@ bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )
|
||||
return m_ok;
|
||||
} // end of wxMemoryDC::CreateCompatible
|
||||
|
||||
void wxMemoryDC::SelectObject(
|
||||
void wxMemoryDC::DoSelect(
|
||||
const wxBitmap& rBitmap
|
||||
)
|
||||
{
|
||||
@@ -168,6 +159,7 @@ void wxMemoryDC::SelectObject(
|
||||
);
|
||||
m_vSelectedBitmap.SetSelectedInto(NULL);
|
||||
}
|
||||
|
||||
m_vSelectedBitmap = rBitmap;
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user