X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..bb90a3e6fddff7169d6020b9b22e1f57c09f8fd9:/src/msw/dcmemory.cpp diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp index 3427da41a1..e68fe93b10 100644 --- a/src/msw/dcmemory.cpp +++ b/src/msw/dcmemory.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcmemory.cpp +// Name: src/msw/dcmemory.cpp // Purpose: wxMemoryDC class // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dcmemory.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,6 +24,8 @@ #pragma hdrstop #endif +#include "wx/dcmemory.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/log.h" @@ -35,8 +33,6 @@ #include "wx/msw/private.h" -#include "wx/dcmemory.h" - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -62,12 +58,8 @@ wxMemoryDC::wxMemoryDC(wxDC *dc) { wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") ); - dc->BeginDrawing(); - CreateCompatible(dc); - dc->EndDrawing(); - Init(); } @@ -89,7 +81,7 @@ bool wxMemoryDC::CreateCompatible(wxDC *dc) m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*dc) : NULL); // as we created the DC, we must delete it in the dtor - m_bOwnsDC = TRUE; + m_bOwnsDC = true; m_ok = m_hDC != 0; @@ -207,4 +199,3 @@ void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord he wxDC::DoDrawRectangle(x, y, width, height); } } -