X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..4fe0156b18e2330be391b804da341e546164b85f:/src/motif/dc.cpp?ds=sidebyside diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp index 46dfe4de2f..939442bd32 100644 --- a/src/motif/dc.cpp +++ b/src/motif/dc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp +// Name: src/motif/dc.cpp // Purpose: wxDC class // Author: Julian Smart // Modified by: @@ -13,10 +13,12 @@ #include "wx/wxprec.h" #include "wx/dc.h" -#include "wx/dcmemory.h" -#include "wx/defs.h" - IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" +#endif + +IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) //----------------------------------------------------------------------------- // wxDC @@ -47,7 +49,7 @@ void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useM wxCHECK_RET( bitmap.Ok(), "invalid bitmap" ); wxMemoryDC memDC; - memDC.SelectObject(bitmap); + memDC.SelectObjectAsSource(bitmap); #if 0 // Not sure if we need this. The mask should leave the masked areas as per @@ -212,4 +214,3 @@ void wxDC::ComputeScaleAndOrigin() m_scaleX = m_logicalScaleX * m_userScaleX; m_scaleY = m_logicalScaleY * m_userScaleY; } -