X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6f1ad222c5c1597a896dd29e69e1c7aa6459be4..54744d3ab7756a61fe2d6ef4e8da5bde9ff2cec2:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index fa53cd8b6e..0744dc251e 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -45,7 +45,12 @@ #include #include +#include "wx/msw/private.h" // needs to be before #include + #if wxUSE_COMMON_DIALOGS +#if wxUSE_NORLANDER_HEADERS + #include +#endif #include #endif @@ -53,11 +58,7 @@ #include #endif -#include "wx/msw/private.h" - -#if !USE_SHARED_LIBRARY - IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif +IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) // --------------------------------------------------------------------------- // constants @@ -68,6 +69,18 @@ static const int VIEWPORT_EXTENT = 1000; static const int MM_POINTS = 9; static const int MM_METRIC = 10; +// usually this is defined in math.h +#ifndef M_PI + static const double M_PI = 3.14159265358979323846; +#endif // M_PI + +// --------------------------------------------------------------------------- +// private functions +// --------------------------------------------------------------------------- + +// convert degrees to radians +static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } + // =========================================================================== // implementation // =========================================================================== @@ -161,7 +174,7 @@ void wxDC::SelectOldObjects(WXHDC dc) // clipping // --------------------------------------------------------------------------- -void wxDC::DoSetClippingRegion(long cx, long cy, long cw, long ch) +void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch) { m_clipping = TRUE; m_clipX1 = (int)cx; @@ -174,7 +187,7 @@ void wxDC::DoSetClippingRegion(long cx, long cy, long cw, long ch) void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) { - wxCHECK_RET( region.GetHRGN(), _T("invalid clipping region") ); + wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") ); wxRect box = region.GetBox(); @@ -249,7 +262,11 @@ void wxDC::Clear() } else { - wxCHECK_RET( m_selectedBitmap.Ok(), _T("this DC can't be cleared") ); + // No, I think we should simply ignore this if printing on e.g. + // a printer DC. + // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") ); + if (!m_selectedBitmap.Ok()) + return; rect.left = 0; rect.top = 0; rect.right = m_selectedBitmap.GetWidth(); @@ -270,7 +287,7 @@ void wxDC::Clear() ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); } -void wxDC::DoFloodFill(long x, long y, const wxColour& col, int style) +void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) { (void)ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), col.GetPixel(), @@ -280,7 +297,7 @@ void wxDC::DoFloodFill(long x, long y, const wxColour& col, int style) CalcBoundingBox(x, y); } -bool wxDC::DoGetPixel(long x, long y, wxColour *col) const +bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const { // added by steve 29.12.94 (copied from DrawPoint) // returns TRUE for pixels in the color of the current pen @@ -305,12 +322,12 @@ bool wxDC::DoGetPixel(long x, long y, wxColour *col) const return(pixelcolor==pencolor); } -void wxDC::DoCrossHair(long x, long y) +void wxDC::DoCrossHair(wxCoord x, wxCoord y) { - long x1 = x-VIEWPORT_EXTENT; - long y1 = y-VIEWPORT_EXTENT; - long x2 = x+VIEWPORT_EXTENT; - long y2 = y+VIEWPORT_EXTENT; + wxCoord x1 = x-VIEWPORT_EXTENT; + wxCoord y1 = y-VIEWPORT_EXTENT; + wxCoord x2 = x+VIEWPORT_EXTENT; + wxCoord y2 = y+VIEWPORT_EXTENT; (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), NULL); (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y)); @@ -322,7 +339,7 @@ void wxDC::DoCrossHair(long x, long y) CalcBoundingBox(x2, y2); } -void wxDC::DoDrawLine(long x1, long y1, long x2, long y2) +void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL); (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2)); @@ -336,30 +353,30 @@ void wxDC::DoDrawLine(long x1, long y1, long x2, long y2) CalcBoundingBox(x2, y2); } -void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc) +void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wxCoord yc) { double dx = xc-x1; double dy = yc-y1; double radius = (double)sqrt(dx*dx+dy*dy) ;; if (x1==x2 && x2==y2) { - DrawEllipse(xc,yc,(long)(radius*2.0),(long)(radius*2.0)); + DrawEllipse(xc,yc,(wxCoord)(radius*2.0),(wxCoord)(radius*2.0)); return; } - long xx1 = XLOG2DEV(x1); - long yy1 = YLOG2DEV(y1); - long xx2 = XLOG2DEV(x2); - long yy2 = YLOG2DEV(y2); - long xxc = XLOG2DEV(xc); - long yyc = YLOG2DEV(yc); - long ray = (long) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))); + wxCoord xx1 = XLOG2DEV(x1); + wxCoord yy1 = YLOG2DEV(y1); + wxCoord xx2 = XLOG2DEV(x2); + wxCoord yy2 = YLOG2DEV(y2); + wxCoord xxc = XLOG2DEV(xc); + wxCoord yyc = YLOG2DEV(yc); + wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))); (void)MoveToEx(GetHdc(), (int) xx1, (int) yy1, NULL); - long xxx1 = (long) (xxc-ray); - long yyy1 = (long) (yyc-ray); - long xxx2 = (long) (xxc+ray); - long yyy2 = (long) (yyc+ray); + wxCoord xxx1 = (wxCoord) (xxc-ray); + wxCoord yyy1 = (wxCoord) (yyc-ray); + wxCoord xxx2 = (wxCoord) (xxc+ray); + wxCoord yyy2 = (wxCoord) (yyc+ray); if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT) { // Have to add 1 to bottom-right corner of rectangle @@ -374,11 +391,11 @@ void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc) Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2); - CalcBoundingBox((xc-radius), (yc-radius)); - CalcBoundingBox((xc+radius), (yc+radius)); + CalcBoundingBox((wxCoord)(xc-radius), (wxCoord)(yc-radius)); + CalcBoundingBox((wxCoord)(xc+radius), (wxCoord)(yc+radius)); } -void wxDC::DoDrawPoint(long x, long y) +void wxDC::DoDrawPoint(wxCoord x, wxCoord y) { COLORREF color = 0x00ffffff; if (m_pen.Ok()) @@ -391,8 +408,30 @@ void wxDC::DoDrawPoint(long x, long y) CalcBoundingBox(x, y); } -void wxDC::DoDrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int fillStyle) +void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) { + COLORREF old_textground = ::GetTextColor(GetHdc()); + COLORREF old_background = ::GetBkColor(GetHdc()); + if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) + { + + if (m_textForegroundColour.Ok()) + { //just the oposite from what is expected see help on pattern brush + // 1 in mask becomes bk color + ::SetBkColor(GetHdc(), m_textForegroundColour.GetPixel() ); + } + if (m_textBackgroundColour.Ok()) + { //just the oposite from what is expected + // 0 in mask becomes text color + ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel() ); + } + + if (m_backgroundMode == wxTRANSPARENT) + SetBkMode(GetHdc(), TRANSPARENT); + else + SetBkMode(GetHdc(), OPAQUE); + } + // Do things less efficiently if we have offsets if (xoffset != 0 || yoffset != 0) { @@ -420,9 +459,16 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int (void)Polygon(GetHdc(), (POINT*) points, n); SetPolyFillMode(GetHdc(),prev); } + + if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) + { + ::SetBkMode(GetHdc(), TRANSPARENT); + ::SetTextColor(GetHdc(), old_textground); + ::SetBkColor(GetHdc(), old_background); + } } -void wxDC::DoDrawLines(int n, wxPoint points[], long xoffset, long yoffset) +void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { // Do things less efficiently if we have offsets if (xoffset != 0 || yoffset != 0) @@ -449,10 +495,32 @@ void wxDC::DoDrawLines(int n, wxPoint points[], long xoffset, long yoffset) } } -void wxDC::DoDrawRectangle(long x, long y, long width, long height) +void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - long x2 = x + width; - long y2 = y + height; + COLORREF old_textground = ::GetTextColor(GetHdc()); + COLORREF old_background = ::GetBkColor(GetHdc()); + if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) + { + + if (m_textForegroundColour.Ok()) + { //just the oposite from what is expected see help on pattern brush + // 1 in mask becomes bk color + ::SetBkColor(GetHdc(), m_textForegroundColour.GetPixel() ); + } + if (m_textBackgroundColour.Ok()) + { //just the oposite from what is expected + // 0 in mask becomes text color + ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel() ); + } + + if (m_backgroundMode == wxTRANSPARENT) + SetBkMode(GetHdc(), TRANSPARENT); + else + SetBkMode(GetHdc(), OPAQUE); + } + + wxCoord x2 = x + width; + wxCoord y2 = y + height; /* MATTHEW: [6] new normalization */ #if WX_STANDARD_GRAPHICS @@ -491,9 +559,16 @@ void wxDC::DoDrawRectangle(long x, long y, long width, long height) CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); + + if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) + { + ::SetBkMode(GetHdc(), TRANSPARENT); + ::SetTextColor(GetHdc(), old_textground); + ::SetBkColor(GetHdc(), old_background); + } } -void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, double radius) +void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { // Now, a negative radius value is interpreted to mean // 'the proportion of the smallest X or Y dimension' @@ -508,8 +583,8 @@ void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, doubl radius = (- radius * smallest); } - long x2 = (x+width); - long y2 = (y+height); + wxCoord x2 = (x+width); + wxCoord y2 = (y+height); (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius))); @@ -518,10 +593,10 @@ void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, doubl CalcBoundingBox(x2, y2); } -void wxDC::DoDrawEllipse(long x, long y, long width, long height) +void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - long x2 = (x+width); - long y2 = (y+height); + wxCoord x2 = (x+width); + wxCoord y2 = (y+height); (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); @@ -530,20 +605,23 @@ void wxDC::DoDrawEllipse(long x, long y, long width, long height) } // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows -void wxDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea) +void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { - long x2 = (x+w); - long y2 = (y+h); + wxCoord x2 = (x+w); + wxCoord y2 = (y+h); - const double deg2rad = 3.14159265359 / 180.0; int rx1 = XLOG2DEV(x+w/2); int ry1 = YLOG2DEV(y+h/2); int rx2 = rx1; int ry2 = ry1; - rx1 += (int)(100.0 * abs(w) * cos(sa * deg2rad)); - ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa * deg2rad)); - rx2 += (int)(100.0 * abs(w) * cos(ea * deg2rad)); - ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea * deg2rad)); + + sa = DegToRad(sa); + ea = DegToRad(ea); + + rx1 += (int)(100.0 * abs(w) * cos(sa)); + ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa)); + rx2 += (int)(100.0 * abs(w) * cos(ea)); + ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea)); // draw pie with NULL_PEN first and then outline otherwise a line is // drawn from the start and end points to the centre @@ -566,34 +644,48 @@ void wxDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea) CalcBoundingBox(x2, y2); } -void wxDC::DoDrawIcon(const wxIcon& icon, long x, long y) +void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) { -#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__) - ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(), - icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL); -#else - ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON()); -#endif + wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") ); + + ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon)); CalcBoundingBox(x, y); - CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight()); + CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight()); } -void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask ) +void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { - if (!bmp.Ok()) - return; + wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") ); + + int width = bmp.GetWidth(), + height = bmp.GetHeight(); - // If we're not drawing transparently, and not drawing to a printer, - // optimize this function to use Windows functions. - if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC))) + if ( !useMask ) { HDC cdc = GetHdc(); HDC memdc = ::CreateCompatibleDC( cdc ); HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( ); + + wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") ); + + COLORREF old_textground = ::GetTextColor(GetHdc()); + COLORREF old_background = ::GetBkColor(GetHdc()); + if (m_textForegroundColour.Ok()) + { + ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); + } + if (m_textBackgroundColour.Ok()) + { + ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); + } + ::SelectObject( memdc, hbitmap ); - ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY); + ::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY); ::DeleteDC( memdc ); + + ::SetTextColor(GetHdc(), old_textground); + ::SetBkColor(GetHdc(), old_background); } else { @@ -601,48 +693,115 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask ) wxMemoryDC memDC; memDC.SelectObject(bmp); - /* Not sure if we need this. The mask should leave the - * masked areas as per the original background of this DC. - */ - /* - // There might be transparent areas, so make these - // the same colour as this DC - memDC.SetBackground(* GetBackground()); - memDC.Clear(); - */ - - Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask); + Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask); memDC.SelectObject(wxNullBitmap); } } -void wxDC::DoDrawText(const wxString& text, long x, long y) +void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) { - if (m_textForegroundColour.Ok()) - SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); + DrawAnyText(text, x, y); + + // update the bounding box + CalcBoundingBox(x, y); + + wxCoord w, h; + GetTextExtent(text, &w, &h); + CalcBoundingBox(x + w, y + h); +} + +void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y) +{ + // prepare for drawing the text + if ( m_textForegroundColour.Ok() ) + SetTextColor(GetHdc(), m_textForegroundColour.GetPixel()); DWORD old_background = 0; - if (m_textBackgroundColour.Ok()) + if ( m_textBackgroundColour.Ok() ) { old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); } - if (m_backgroundMode == wxTRANSPARENT) - SetBkMode(GetHdc(), TRANSPARENT); - else - SetBkMode(GetHdc(), OPAQUE); + SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT + : OPAQUE); - (void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), WXSTRINGCAST text, wxStrlen(WXSTRINGCAST text)); + if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), + text.c_str(), text.length()) == 0 ) + { + wxLogLastError("TextOut"); + } - if (m_textBackgroundColour.Ok()) + // restore the old parameters (text foreground colour may be left because + // it never is set to anything else, but background should remain + // transparent even if we just drew an opaque string) + if ( m_textBackgroundColour.Ok() ) (void)SetBkColor(GetHdc(), old_background); - CalcBoundingBox(x, y); + SetBkMode(GetHdc(), TRANSPARENT); +} - long w, h; - GetTextExtent(text, &w, &h); - CalcBoundingBox((x + w), (y + h)); +void wxDC::DoDrawRotatedText(const wxString& text, + wxCoord x, wxCoord y, + double angle) +{ + // we test that we have some font because otherwise we should still use the + // "else" part below to avoid that DrawRotatedText(angle = 180) and + // DrawRotatedText(angle = 0) use different fonts (we can't use the default + // font for drawing rotated fonts unfortunately) + if ( (angle == 0.0) && m_font.Ok() ) + { + DoDrawText(text, x, y); + } + else + { + // NB: don't take DEFAULT_GUI_FONT because it's not TrueType and so + // can't have non zero orientation/escapement + wxFont font = m_font.Ok() ? m_font : *wxNORMAL_FONT; + HFONT hfont = (HFONT)font.GetResourceHandle(); + LOGFONT lf; + if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 ) + { + wxLogLastError("GetObject(hfont)"); + } + + // GDI wants the angle in tenth of degree + long angle10 = (long)(angle * 10); + lf.lfEscapement = angle10; + lf. lfOrientation = angle10; + + hfont = ::CreateFontIndirect(&lf); + if ( !hfont ) + { + wxLogLastError("CreateFont"); + } + else + { + HFONT hfontOld = (HFONT)::SelectObject(GetHdc(), hfont); + + DrawAnyText(text, x, y); + + (void)::SelectObject(GetHdc(), hfontOld); + } + + // call the bounding box by adding all four vertices of the rectangle + // containing the text to it (simpler and probably not slower than + // determining which of them is really topmost/leftmost/...) + wxCoord w, h; + GetTextExtent(text, &w, &h); + + double rad = DegToRad(angle); + + // "upper left" and "upper right" + CalcBoundingBox(x, y); + CalcBoundingBox(x + w*cos(rad), y - h*sin(rad)); + + // "bottom left" and "bottom right" + x += (wxCoord)(h*sin(rad)); + y += (wxCoord)(h*cos(rad)); + CalcBoundingBox(x, y); + CalcBoundingBox(x + h*sin(rad), y + h*cos(rad)); + } } // --------------------------------------------------------------------------- @@ -708,7 +867,7 @@ void wxDC::SetFont(const wxFont& the_font) HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle()); if (f == (HFONT) NULL) { - wxLogDebug(_T("::SelectObject failed in wxDC::SetFont.")); + wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont.")); } if (!m_oldFont) m_oldFont = (WXHFONT) f; @@ -821,10 +980,15 @@ void wxDC::SetBackgroundMode(int mode) { m_backgroundMode = mode; + // SetBackgroundColour now only refers to text background + // and m_backgroundMode is used there + +/* if (m_backgroundMode == wxTRANSPARENT) ::SetBkMode(GetHdc(), TRANSPARENT); else ::SetBkMode(GetHdc(), OPAQUE); +*/ } void wxDC::SetLogicalFunction(int function) @@ -886,7 +1050,7 @@ void wxDC::EndPage() // text metrics // --------------------------------------------------------------------------- -long wxDC::GetCharHeight() const +wxCoord wxDC::GetCharHeight() const { TEXTMETRIC lpTextMetric; @@ -895,7 +1059,7 @@ long wxDC::GetCharHeight() const return YDEV2LOGREL(lpTextMetric.tmHeight); } -long wxDC::GetCharWidth() const +wxCoord wxDC::GetCharWidth() const { TEXTMETRIC lpTextMetric; @@ -904,9 +1068,9 @@ long wxDC::GetCharWidth() const return XDEV2LOGREL(lpTextMetric.tmAveCharWidth); } -void wxDC::GetTextExtent(const wxString& string, long *x, long *y, - long *descent, long *externalLeading, - wxFont *theFont) const +void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, + wxCoord *descent, wxCoord *externalLeading, + wxFont *theFont) const { wxFont *fontToUse = (wxFont*) theFont; if (!fontToUse) @@ -1016,7 +1180,7 @@ void wxDC::SetSystemScale(double x, double y) SetMapMode(m_mappingMode); } -void wxDC::SetLogicalOrigin(long x, long y) +void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y) { m_logicalOriginX = x; m_logicalOriginY = y; @@ -1024,7 +1188,7 @@ void wxDC::SetLogicalOrigin(long x, long y) ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); } -void wxDC::SetDeviceOrigin(long x, long y) +void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y) { m_deviceOriginX = x; m_deviceOriginY = y; @@ -1036,59 +1200,69 @@ void wxDC::SetDeviceOrigin(long x, long y) // coordinates transformations // --------------------------------------------------------------------------- -long wxDCBase::DeviceToLogicalX(long x) const +wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const { - return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX); + return (wxCoord) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX); } -long wxDCBase::DeviceToLogicalXRel(long x) const +wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const { - return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX)); + return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX)); } -long wxDCBase::DeviceToLogicalY(long y) const +wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const { - return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY); + return (wxCoord) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY); } -long wxDCBase::DeviceToLogicalYRel(long y) const +wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const { - return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY)); + return (wxCoord) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY)); } -long wxDCBase::LogicalToDeviceX(long x) const +wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const { - return (long) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX); + return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX); } -long wxDCBase::LogicalToDeviceXRel(long x) const +wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const { - return (long) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX); + return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX); } -long wxDCBase::LogicalToDeviceY(long y) const +wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const { - return (long) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY); + return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY); } -long wxDCBase::LogicalToDeviceYRel(long y) const +wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const { - return (long) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY); + return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY); } // --------------------------------------------------------------------------- // bit blit // --------------------------------------------------------------------------- -bool wxDC::DoBlit(long xdest, long ydest, long width, long height, - wxDC *source, long xsrc, long ysrc, int rop, bool useMask) + +bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, + wxCoord width, wxCoord height, + wxDC *source, wxCoord xsrc, wxCoord ysrc, + int rop, bool useMask) { - long xdest1 = xdest; - long ydest1 = ydest; - long xsrc1 = xsrc; - long ysrc1 = ysrc; + wxMask *mask = NULL; + if ( useMask ) + { + const wxBitmap& bmp = source->m_selectedBitmap; + mask = bmp.GetMask(); + + if ( !(bmp.Ok() && mask && mask->GetMaskBitmap()) ) + { + // don't give assert here because this would break existing + // programs - just silently ignore useMask parameter + useMask = FALSE; + } + } - // Chris Breeze 18/5/98: use text foreground/background colours - // when blitting from 1-bit bitmaps COLORREF old_textground = ::GetTextColor(GetHdc()); COLORREF old_background = ::GetBkColor(GetHdc()); if (m_textForegroundColour.Ok()) @@ -1101,147 +1275,115 @@ bool wxDC::DoBlit(long xdest, long ydest, long width, long height, } DWORD dwRop = rop == wxCOPY ? SRCCOPY : - rop == wxCLEAR ? WHITENESS : - rop == wxSET ? BLACKNESS : - rop == wxINVERT ? DSTINVERT : - rop == wxAND ? MERGECOPY : - rop == wxOR ? MERGEPAINT : - rop == wxSRC_INVERT ? NOTSRCCOPY : - rop == wxXOR ? SRCINVERT : - rop == wxOR_REVERSE ? MERGEPAINT : - rop == wxAND_REVERSE ? SRCERASE : - rop == wxSRC_OR ? SRCPAINT : - rop == wxSRC_AND ? SRCAND : - SRCCOPY; - - bool success = TRUE; - if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask()) + rop == wxCLEAR ? WHITENESS : + rop == wxSET ? BLACKNESS : + rop == wxINVERT ? DSTINVERT : + rop == wxAND ? MERGECOPY : + rop == wxOR ? MERGEPAINT : + rop == wxSRC_INVERT ? NOTSRCCOPY : + rop == wxXOR ? SRCINVERT : + rop == wxOR_REVERSE ? MERGEPAINT : + rop == wxAND_REVERSE ? SRCERASE : + rop == wxSRC_OR ? SRCPAINT : + rop == wxSRC_AND ? SRCAND : + SRCCOPY; + + bool success; + + if (useMask) { - -#if 0 // __WIN32__ - // Not implemented under Win95 (or maybe a specific device?) - if (MaskBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, - (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(), - 0, 0, 0xAACC0020)) - { - // Success - } - else -#endif +#ifdef __WIN32__ + HBITMAP hbmpMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap()); + + // we want the part of the image corresponding to the mask to be + // transparent, i.e. do PATCOPY there and apply dwRop elsewhere + const wxColour& colBg = m_backgroundBrush.GetColour(); + HBRUSH hbrBg = (HBRUSH)::CreateSolidBrush(wxColourToRGB(colBg)); + HBRUSH hbrOld = (HBRUSH)::SelectObject(GetHdc(), hbrBg); + + success = ::MaskBlt(GetHdc(), xdest, ydest, width, height, + GetHdcOf(*source), xsrc, ysrc, + hbmpMask, 0, 0, + MAKEROP4(PATCOPY, dwRop)) != 0; + + (void)::SelectObject(GetHdc(), hbrOld); + ::DeleteObject(hbrOld); + ::DeleteObject(hbmpMask); + + if ( !success ) +#endif // Win32 { - // Old code -#if 0 - HDC dc_mask = CreateCompatibleDC((HDC) source->m_hDC); - ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); - success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0); - success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, - (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0); - ::SelectObject(dc_mask, 0); - ::DeleteDC(dc_mask); -#endif - // New code from Chris Breeze, 15/7/98 // Blit bitmap with mask - if (IsKindOf(CLASSINFO(wxPrinterDC))) + // create a temp buffer bitmap and DCs to access it and the mask + HDC dc_mask = ::CreateCompatibleDC(GetHdcOf(*source)); + HDC dc_buffer = ::CreateCompatibleDC(GetHdc()); + HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height); + ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap()); + ::SelectObject(dc_buffer, buffer_bmap); + + // copy dest to buffer + if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + GetHdc(), xdest, ydest, SRCCOPY) ) { - // 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(GetHdc(), &rect, brush); - ::DeleteObject(brush); - } - } - } - ::SelectObject(dc_mask, 0); - ::DeleteDC(dc_mask); + wxLogLastError("BitBlt"); } - else + + // copy src to buffer using selected raster op + if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + GetHdcOf(*source), xsrc, ysrc, dwRop) ) { - // 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(GetHdc()); - HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), 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, - GetHdc(), 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(GetHdc(), RGB(255, 255, 255)); - COLORREF prevCol = ::SetTextColor(GetHdc(), 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(GetHdc(), RGB(0, 0, 0)); - ::SetTextColor(GetHdc(), RGB(255, 255, 255)); - ::BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, SRCAND); - ::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values - ::SetTextColor(GetHdc(), prevCol); - - // OR buffer to dest - success = (::BitBlt(GetHdc(), 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); + wxLogLastError("BitBlt"); } - } - } - 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++) + + // set masked area in buffer to BLACK (pixel value 0) + COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255)); + COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0)); + if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + dc_mask, xsrc, ysrc, SRCAND) ) + { + wxLogLastError("BitBlt"); + } + + // set unmasked area in dest to BLACK + ::SetBkColor(GetHdc(), RGB(0, 0, 0)); + ::SetTextColor(GetHdc(), RGB(255, 255, 255)); + if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height, + dc_mask, xsrc, ysrc, SRCAND) ) + { + wxLogLastError("BitBlt"); + } + ::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values + ::SetTextColor(GetHdc(), prevCol); + + // OR buffer to dest + success = ::BitBlt(GetHdc(), xdest, ydest, + (int)width, (int)height, + dc_buffer, 0, 0, SRCPAINT) != 0; + if ( !success ) { - 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(GetHdc(), &rect, brush); - ::DeleteObject(brush); - } + wxLogLastError("BitBlt"); } + + // tidy up temporary DCs and bitmap + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); + ::SelectObject(dc_buffer, 0); + ::DeleteDC(dc_buffer); + ::DeleteObject(buffer_bmap); } - else + } + else // no mask, just BitBlt() it + { + success = ::BitBlt(GetHdc(), xdest, ydest, + (int)width, (int)height, + GetHdcOf(*source), xsrc, ysrc, dwRop) != 0; + if ( !success ) { - success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, - xsrc1, ysrc1, dwRop) != 0); + wxLogLastError("BitBlt"); } } + ::SetTextColor(GetHdc(), old_textground); ::SetBkColor(GetHdc(), old_background); @@ -1280,7 +1422,7 @@ void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y, float *descent, float *externalLeading, wxFont *theFont, bool use16bit) const { - long x1, y1, descent1, externalLeading1; + wxCoord x1, y1, descent1, externalLeading1; GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit); *x = x1; *y = y1; if (descent)