X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/dcmemory.cpp?ds=sidebyside diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp index 1a59e06627..5565670444 100644 --- a/src/msw/dcmemory.cpp +++ b/src/msw/dcmemory.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcmemory.cpp +// Name: src/msw/dcmemory.cpp // Purpose: wxMemoryDC class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #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,13 +33,11 @@ #include "wx/msw/private.h" -#include "wx/dcmemory.h" - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- - IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) +IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) // ============================================================================ // implementation @@ -51,42 +47,41 @@ // wxMemoryDC // ---------------------------------------------------------------------------- -wxMemoryDC::wxMemoryDC() +wxMemoryDC::wxMemoryDC(wxDC *dc) { - m_hDC = (WXHDC) ::CreateCompatibleDC((HDC) NULL); - m_ok = (m_hDC != 0); - m_bOwnsDC = TRUE; + wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") ); - SetBrush(*wxWHITE_BRUSH); - SetPen(*wxBLACK_PEN); + CreateCompatible(dc); - // the background mode is only used for text background and is set in - // DrawText() to OPAQUE as required, otherwise always TRANSPARENT - ::SetBkMode( GetHdc(), TRANSPARENT ); + Init(); } -wxMemoryDC::wxMemoryDC(wxDC *old_dc) +void wxMemoryDC::Init() { - old_dc->BeginDrawing(); + if ( m_ok ) + { + SetBrush(*wxWHITE_BRUSH); + SetPen(*wxBLACK_PEN); - m_hDC = (WXHDC) ::CreateCompatibleDC(GetHdcOf(*old_dc)); - m_ok = (m_hDC != 0); + // the background mode is only used for text background and is set in + // DrawText() to OPAQUE as required, otherwise always TRANSPARENT + ::SetBkMode( GetHdc(), TRANSPARENT ); + } +} - old_dc->EndDrawing(); +bool wxMemoryDC::CreateCompatible(wxDC *dc) +{ + m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*dc) : NULL); - SetBrush(*wxWHITE_BRUSH); - SetPen(*wxBLACK_PEN); + // as we created the DC, we must delete it in the dtor + m_bOwnsDC = true; - // the background mode is only used for text background and is set in - // DrawText() to OPAQUE as required, otherwise always TRANSPARENT - ::SetBkMode( GetHdc(), TRANSPARENT ); -} + m_ok = m_hDC != 0; -wxMemoryDC::~wxMemoryDC() -{ + return m_ok; } -void wxMemoryDC::SelectObject(const wxBitmap& bitmap) +void wxMemoryDC::DoSelect( const wxBitmap& bitmap) { // select old bitmap out of the device context if ( m_oldBitmap ) @@ -94,28 +89,31 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap) ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap); if ( m_selectedBitmap.Ok() ) { +#ifdef __WXDEBUG__ m_selectedBitmap.SetSelectedInto(NULL); +#endif m_selectedBitmap = wxNullBitmap; } } // check for whether the bitmap is already selected into a device context - wxCHECK_RET( !bitmap.GetSelectedInto() || - (bitmap.GetSelectedInto() == this), - wxT("Bitmap is selected in another wxMemoryDC, delete the " - "first wxMemoryDC or use SelectObject(NULL)") ); + wxASSERT_MSG( !bitmap.GetSelectedInto() || + (bitmap.GetSelectedInto() == this), + wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") ); m_selectedBitmap = bitmap; WXHBITMAP hBmp = m_selectedBitmap.GetHBITMAP(); if ( !hBmp ) return; +#ifdef __WXDEBUG__ m_selectedBitmap.SetSelectedInto(this); +#endif hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp); if ( !hBmp ) { - wxLogLastError("SelectObject(memDC, bitmap)"); + wxLogLastError(wxT("SelectObject(memDC, bitmap)")); wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC")); } @@ -139,3 +137,58 @@ void wxMemoryDC::DoGetSize(int *width, int *height) const } } +// the rest of this file deals with drawing rectangles workaround, disabled by +// default + +#define wxUSE_MEMORY_DC_DRAW_RECTANGLE 0 + +#if wxUSE_MEMORY_DC_DRAW_RECTANGLE + +// For some reason, drawing a rectangle on a memory DC has problems. +// Use this substitute if we can. +static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoord height) +{ + wxBrush brush(dc.GetBrush()); + wxPen pen(dc.GetPen()); + if (brush.Ok() && brush.GetStyle() != wxTRANSPARENT) + { + HBRUSH hBrush = (HBRUSH) brush.GetResourceHandle() ; + if (hBrush) + { + RECT rect; + rect.left = x; rect.top = y; + rect.right = x + width - 1; + rect.bottom = y + height - 1; + ::FillRect((HDC) dc.GetHDC(), &rect, hBrush); + } + } + width --; height --; + if (pen.Ok() && pen.GetStyle() != wxTRANSPARENT) + { + dc.DrawLine(x, y, x + width, y); + dc.DrawLine(x, y, x, y + height); + dc.DrawLine(x, y+height, x+width, y + height); + dc.DrawLine(x+width, y+height, x+width, y); + } +} + +#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE + +void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +{ + // Set this to 1 to work around an apparent video driver bug + // (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample) +#if wxUSE_MEMORY_DC_DRAW_RECTANGLE + if (m_brush.Ok() && m_pen.Ok() && + (m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) && + (m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) && + (GetLogicalFunction() == wxCOPY)) + { + wxDrawRectangle(* this, x, y, width, height); + } + else +#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE + { + wxDC::DoDrawRectangle(x, y, width, height); + } +}