X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..ec5006bdc630dd6b3d4cad1a3b572ab4c695a029:/src/os2/dcmemory.cpp?ds=sidebyside diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp index aeeff2c76b..1332c9d2fb 100644 --- a/src/os2/dcmemory.cpp +++ b/src/os2/dcmemory.cpp @@ -12,6 +12,8 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/dcmemory.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" @@ -20,20 +22,12 @@ #include "wx/os2/private.h" -#include "wx/dcmemory.h" - IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) ///////////////////////////////////////////////////////////////////////////// // Memory DC ///////////////////////////////////////////////////////////////////////////// -wxMemoryDC::wxMemoryDC(void) -{ - CreateCompatible(NULL); - Init(); -} // end of wxMemoryDC::wxMemoryDC - wxMemoryDC::wxMemoryDC( wxDC* pOldDC ) @@ -118,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 ) { @@ -165,6 +159,7 @@ void wxMemoryDC::SelectObject( ); m_vSelectedBitmap.SetSelectedInto(NULL); } + m_vSelectedBitmap = rBitmap;