X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ae7410f5522bc6047b842359318fc9521353186..fcb29b233888f7012ca6cf486c8287f5463787e0:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index f22685ba97..dd4750f6a0 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -930,7 +930,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) // transparent pen) one pixel smaller in both directions and we want them // to have the same size regardless of which pen is used - adjust - // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR. + // I wonder if this shouldnt be done after the LOG2DEV() conversions. RR. if ( m_pen.GetStyle() == wxTRANSPARENT ) { // Apparently not needed for WinCE (see e.g. Life! demo) @@ -1245,7 +1245,8 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask // Rather than reproduce wxDC::Blit, let's do it at the wxWin API // level wxMemoryDC memDC; - memDC.SelectObject(bmp); + + memDC.SelectObjectAsSource(bmp); Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask); @@ -2685,8 +2686,8 @@ void wxDC::DoGradientFillLinear (const wxRect& rect, vertices[0].x = rect.GetLeft(); vertices[0].y = rect.GetTop(); - vertices[1].x = rect.GetRight(); - vertices[1].y = rect.GetBottom(); + vertices[1].x = rect.GetRight()+1; + vertices[1].y = rect.GetBottom()+1; vertices[firstVertex].Red = (COLOR16)(initialColour.Red() << 8); vertices[firstVertex].Green = (COLOR16)(initialColour.Green() << 8);