X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96be256b3e1802de10f45953c41ed33bce399b54..806ad819585655ac1c35427409611d7795d0b910:/src/motif/dc.cpp diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp index c845f09818..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: @@ -9,18 +9,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dc.h" -#endif - // For compilers that support precompilation, includes "wx.h". #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 @@ -51,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 @@ -216,4 +214,3 @@ void wxDC::ComputeScaleAndOrigin() m_scaleX = m_logicalScaleX * m_userScaleX; m_scaleY = m_logicalScaleY * m_userScaleY; } -