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:
Vadim Zeitlin
2006-10-30 19:41:46 +00:00
parent d2a93a2af3
commit fea35690f1
28 changed files with 185 additions and 148 deletions

View File

@@ -35,7 +35,7 @@
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
void wxMemoryDC::Init()
{
m_ok = true;
m_display = wxGetDisplay();
@@ -57,9 +57,6 @@ wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
if ( bitmap.IsOk() )
SelectObject(bitmap);
}
wxMemoryDC::wxMemoryDC( wxDC* dc )
@@ -92,7 +89,7 @@ wxMemoryDC::~wxMemoryDC(void)
{
}
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
void wxMemoryDC::DoSelect( const wxBitmap& bitmap )
{
m_bitmap = bitmap;