X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a6c0a8bdadc52e87e6d1e315d1bf6f192880bd0..77ff2d2639049a0bd8d64d87fbe27694354b7097:/src/msw/dc.cpp?ds=sidebyside diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index ccafc05202..bd81c9362d 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -130,14 +130,14 @@ wxDC::~wxDC(void) // DC. void wxDC::SelectOldObjects(WXHDC dc) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects %X\n", this); #endif if (dc) { if (m_oldBitmap) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBITMAP %X\n", m_oldBitmap); #endif ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap); @@ -149,7 +149,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldBitmap = 0 ; if (m_oldPen) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPEN %X\n", m_oldPen); #endif ::SelectObject((HDC) dc, (HPEN) m_oldPen); @@ -157,7 +157,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldPen = 0 ; if (m_oldBrush) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBRUSH %X\n", m_oldBrush); #endif ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush); @@ -165,7 +165,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldBrush = 0 ; if (m_oldFont) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HFONT %X\n", m_oldFont); #endif ::SelectObject((HDC) dc, (HFONT) m_oldFont); @@ -173,12 +173,12 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldFont = 0 ; if (m_oldPalette) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPALETTE %X\n", m_oldPalette); #endif ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE); } -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Done.\n"); #endif m_oldPalette = 0 ; @@ -217,11 +217,11 @@ void wxDC::DestroyClippingRegion(void) if (m_clipping && m_hDC) { HRGN rgn = CreateRectRgn(0, 0, 32000, 32000); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DestroyClippingRegion: Selecting HRGN %X\n", rgn); #endif SelectClipRgn((HDC) m_hDC, rgn); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DestroyClippingRegion: Deleting HRGN %X\n", rgn); #endif DeleteObject(rgn); @@ -267,7 +267,7 @@ void wxDC::SetPalette(const wxPalette& palette) if (m_oldPalette) { ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetPalette: set old palette %X\n", m_oldPalette); #endif m_oldPalette = 0; @@ -282,7 +282,7 @@ void wxDC::SetPalette(const wxPalette& palette) if (!m_oldPalette) m_oldPalette = (WXHPALETTE) oldPal; -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetPalette %X: selected palette %X\n", this, m_palette.GetHPALETTE()); if (oldPal) wxDebugMsg("wxDC::SetPalette: oldPal was palette %X\n", oldPal); @@ -386,7 +386,7 @@ void wxDC::DrawLine(long x1, long y1, long x2, long y2) CalcBoundingBox(x2, y2); } -void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc) +void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc) { double dx = xc-x1 ; double dy = yc-y1 ; @@ -510,7 +510,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height) HPEN orig_pen = NULL; if (do_pen || !m_pen.Ok()) - orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN)); + orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN)); (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1); @@ -522,7 +522,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height) HBRUSH orig_brush = NULL; if (do_brush || !m_brush.Ok()) - orig_brush = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_BRUSH)); + orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH)); (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); @@ -592,7 +592,7 @@ void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea) // draw pie with NULL_PEN first and then outline otherwise a line is // drawn from the start and end points to the centre - HPEN orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN)); + HPEN orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN)); if (m_signY > 0) { (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1, @@ -639,7 +639,7 @@ void wxDC::SetFont(const wxFont& the_font) if (m_font.Ok() && m_font.GetResourceHandle()) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetFont: Selecting HFONT %X\n", m_font.GetResourceHandle()); #endif HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); @@ -702,7 +702,7 @@ void wxDC::SetBrush(const wxBrush& brush) if (m_brush.GetResourceHandle()) { HBRUSH b = 0; - b = ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ; + b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ; if (!m_oldBrush) m_oldBrush = (WXHBRUSH) b; } @@ -713,10 +713,10 @@ void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit) { if (m_font.Ok() && m_font.GetResourceHandle()) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DrawText: Selecting HFONT %X\n", m_font.GetResourceHandle()); #endif - HFONT f = ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); + HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); if (!m_oldFont) m_oldFont = (WXHFONT) f; } @@ -914,8 +914,8 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y, GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect); GetTextMetrics((HDC) m_hDC, &tm); - *x = XDEV2LOGREL(sizeRect.cx); - *y = YDEV2LOGREL(sizeRect.cy); + if (x) *x = XDEV2LOGREL(sizeRect.cx); + if (y) *y = YDEV2LOGREL(sizeRect.cy); if (descent) *descent = tm.tmDescent; if (externalLeading) *externalLeading = tm.tmExternalLeading; } @@ -1181,53 +1181,107 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height, ::SelectObject(dc_mask, 0); ::DeleteDC(dc_mask); #endif - // New code from Chris Breeze, 8/5/98 - - // create a temp buffer bitmap and DCs to access it and the mask - HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); - HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC); - HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height); - ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); - ::SelectObject(dc_buffer, buffer_bmap); - - // copy dest to buffer - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - (HDC) m_hDC, xdest1, ydest1, SRCCOPY); - - // copy src to buffer using selected raster op - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - (HDC) source->m_hDC, xsrc1, ysrc1, dwRop); - - // set masked area in buffer to BLACK (pixel value 0) - COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255)); - COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0)); - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, SRCAND); - - // set unmasked area in dest to BLACK - ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0)); - ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255)); - ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, SRCAND); - ::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values - ::SetTextColor((HDC) m_hDC, prevCol); - - // OR buffer to dest - success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - dc_buffer, 0, 0, SRCPAINT) != 0); - - // tidy up temporary DCs and bitmap - ::SelectObject(dc_mask, 0); - ::DeleteDC(dc_mask); - ::SelectObject(dc_buffer, 0); - ::DeleteDC(dc_buffer); - ::DeleteObject(buffer_bmap); - } + // New code from Chris Breeze, 15/7/98 + // Blit bitmap with mask + + if (IsKindOf(CLASSINFO(wxPrinterDC))) + { + // If we are printing source colours are screen colours + // not printer colours and so we need copy the bitmap + // pixel by pixel. + RECT rect; + HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); + HDC dc_src = (HDC) source->m_hDC; + + ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); + for (int x = 0; x < width; x++) + { + for (int y = 0; y < height; y++) + { + COLORREF cref = ::GetPixel(dc_mask, x, y); + if (cref) + { + HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y)); + rect.left = xdest1 + x; rect.right = rect.left + 1; + rect.top = ydest1 + y; rect.bottom = rect.top + 1; + ::FillRect((HDC) m_hDC, &rect, brush); + ::DeleteObject(brush); + } + } + } + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); + } + else + { + // create a temp buffer bitmap and DCs to access it and the mask + HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); + HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC); + HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height); + ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); + ::SelectObject(dc_buffer, buffer_bmap); + + // copy dest to buffer + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + (HDC) m_hDC, xdest1, ydest1, SRCCOPY); + + // copy src to buffer using selected raster op + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + (HDC) source->m_hDC, xsrc1, ysrc1, dwRop); + + // set masked area in buffer to BLACK (pixel value 0) + COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255)); + COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0)); + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, SRCAND); + + // set unmasked area in dest to BLACK + ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0)); + ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255)); + ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, SRCAND); + ::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values + ::SetTextColor((HDC) m_hDC, prevCol); + + // OR buffer to dest + success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, + dc_buffer, 0, 0, SRCPAINT) != 0); + + // tidy up temporary DCs and bitmap + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); + ::SelectObject(dc_buffer, 0); + ::DeleteDC(dc_buffer); + ::DeleteObject(buffer_bmap); + } + } } else { + if (IsKindOf(CLASSINFO(wxPrinterDC))) + { + // If we are printing source colours are screen colours + // not printer colours and so we need copy the bitmap + // pixel by pixel. + HDC dc_src = (HDC) source->m_hDC; + RECT rect; + for (int x = 0; x < width; x++) + { + for (int y = 0; y < height; y++) + { + HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y)); + rect.left = xdest1 + x; rect.right = rect.left + 1; + rect.top = ydest1 + y; rect.bottom = rect.top + 1; + ::FillRect((HDC) m_hDC, &rect, brush); + ::DeleteObject(brush); + } + } + } + else + { success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, xsrc1, ysrc1, dwRop) != 0); + } } ::SetTextColor((HDC)m_hDC, old_textground); ::SetBkColor((HDC)m_hDC, old_background);