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

@@ -23,13 +23,13 @@ class WXDLLEXPORT wxMemoryDC;
// wxMemoryDC
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxMemoryDC : public wxDC
class WXDLLEXPORT wxMemoryDC : public wxDC, public wxMemoryDCBase
{
public:
wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
wxMemoryDC() { Init(); }
wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
wxMemoryDC(wxDC *dc); // Create compatible DC
virtual ~wxMemoryDC();
virtual void SelectObject(const wxBitmap& bitmap);
// these get reimplemented for mono-bitmaps to behave
// more like their Win32 couterparts. They now interpret
@@ -45,7 +45,12 @@ public:
wxBitmap GetSelectedObject() const { return m_selected; }
protected:
virtual void DoSelect(const wxBitmap& bitmap);
private:
void Init();
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
};