#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
#if wxUSE_COMMON_DIALOGS
-#if wxUSE_NORLANDER_HEADERS
- #include <windows.h>
-#endif
#include <commdlg.h>
#endif
#include <print.h>
#endif
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
// ---------------------------------------------------------------------------
// constants
static const double M_PI = 3.14159265358979323846;
#endif // M_PI
+// ROPs which don't have standard names (see "Ternary Raster Operations" in the
+// MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
+#define DSTCOPY 0x00AA0029 // a.k.a. NOP operation
+
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
// convert degrees to radians
static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// instead of duplicating the same code which sets and then restores text
+// colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
+// encapsulate this in a small helper class
+
+// wxColourChanger: changes the text colours in the ctor if required and
+// restores them in the dtor
+class wxColourChanger
+{
+public:
+ wxColourChanger(wxDC& dc);
+ ~wxColourChanger();
+
+private:
+ wxDC& m_dc;
+
+ COLORREF m_colFgOld, m_colBgOld;
+
+ bool m_changed;
+};
+
// ===========================================================================
// implementation
// ===========================================================================
+// ----------------------------------------------------------------------------
+// wxColourChanger
+// ----------------------------------------------------------------------------
+
+wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+{
+ if ( dc.GetBrush().GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+ {
+ HDC hdc = GetHdcOf(dc);
+ m_colFgOld = ::GetTextColor(hdc);
+ m_colBgOld = ::GetBkColor(hdc);
+
+ // note that Windows convention is opposite to wxWindows one, this is
+ // why text colour becomes the background one and vice versa
+ const wxColour& colFg = dc.GetTextForeground();
+ if ( colFg.Ok() )
+ {
+ ::SetBkColor(hdc, colFg.GetPixel());
+ }
+
+ const wxColour& colBg = dc.GetTextBackground();
+ if ( colBg.Ok() )
+ {
+ ::SetTextColor(hdc, colBg.GetPixel());
+ }
+
+ SetBkMode(hdc,
+ dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
+ : OPAQUE);
+
+ // flag which telsl us to undo changes in the dtor
+ m_changed = TRUE;
+ }
+ else
+ {
+ // nothing done, nothing to undo
+ m_changed = FALSE;
+ }
+}
+
+wxColourChanger::~wxColourChanger()
+{
+ if ( m_changed )
+ {
+ // restore the colours we changed
+ HDC hdc = GetHdcOf(m_dc);
+
+ ::SetBkMode(hdc, TRANSPARENT);
+ ::SetTextColor(hdc, m_colFgOld);
+ ::SetBkColor(hdc, m_colBgOld);
+ }
+}
+
// ---------------------------------------------------------------------------
// wxDC
// ---------------------------------------------------------------------------
// clipping
// ---------------------------------------------------------------------------
+#define DO_SET_CLIPPING_BOX() \
+{ \
+ RECT rect; \
+ \
+ GetClipBox(GetHdc(), &rect); \
+ \
+ m_clipX1 = (wxCoord) XDEV2LOG(rect.left); \
+ m_clipY1 = (wxCoord) YDEV2LOG(rect.top); \
+ m_clipX2 = (wxCoord) XDEV2LOG(rect.right); \
+ m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom); \
+}
+
void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
{
m_clipping = TRUE;
- m_clipX1 = (int)cx;
- m_clipY1 = (int)cy;
- m_clipX2 = (int)(cx + cw);
- m_clipY2 = (int)(cy + ch);
-
- DoClipping((WXHDC) m_hDC);
+ IntersectClipRect(GetHdc(), XLOG2DEV(cx), YLOG2DEV(cy),
+ XLOG2DEV(cx + cw), YLOG2DEV(cy + ch));
+ DO_SET_CLIPPING_BOX()
}
void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
{
wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
- wxRect box = region.GetBox();
-
m_clipping = TRUE;
- m_clipX1 = box.x;
- m_clipY1 = box.y;
- m_clipX2 = box.x + box.width;
- m_clipY2 = box.y + box.height;
#ifdef __WIN16__
SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());
#else
ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND);
#endif
-}
-void wxDC::DoClipping(WXHDC dc)
-{
- if (m_clipping && dc)
- {
- IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
- XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
- }
+ DO_SET_CLIPPING_BOX()
}
void wxDC::DestroyClippingRegion()
// * The point is outside the clipping region that is, it is not
// visible on the device.
//
- wxLogLastError("ExtFloodFill");
+ wxLogLastError(wxT("ExtFloodFill"));
}
CalcBoundingBox(x, y);
bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{
+ wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel") );
+
// get the color of the pixel
COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
- // get the color of the pen
- COLORREF pencolor = 0x00ffffff;
- if (m_pen.Ok())
- {
- pencolor = m_pen.GetColour().GetPixel();
- }
-
- // return the color of the pixel
- if( col )
- {
- col->Set(GetRValue(pixelcolor),
- GetGValue(pixelcolor),
- GetBValue(pixelcolor));
- }
+ wxRGBToColour(*col, pixelcolor);
- // check, if color of the pixels is the same as the color of the current
- // pen and return TRUE if it is, FALSE otherwise
- return pixelcolor == pencolor;
+ return TRUE;
}
void wxDC::DoCrossHair(wxCoord x, wxCoord y)
(void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
(void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
- /* MATTHEW: [6] New normalization */
-#if WX_STANDARD_GRAPHICS
- (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
-#endif
+ // Normalization: Windows doesn't draw the last point of the line.
+ // But apparently neither does GTK+, so we take it out again.
+// (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
CalcBoundingBox(x1, y1);
CalcBoundingBox(x2, y2);
}
-void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wxCoord yc)
+// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
+// and ending at (x2, y2)
+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)
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+ double dx = xc - x1;
+ double dy = yc - y1;
+ double radius = (double)sqrt(dx*dx+dy*dy);
+ wxCoord r = (wxCoord)radius;
+
+ // treat the special case of full circle separately
+ if ( x1 == x2 && y1 == y2 )
{
- DrawEllipse(xc,yc,(wxCoord)(radius*2.0),(wxCoord)(radius*2.0));
+ DrawEllipse(xc - r, yc - r, 2*r, 2*r);
return;
}
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);
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)
+
+ if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )
{
// Have to add 1 to bottom-right corner of rectangle
// to make semi-circles look right (crooked line otherwise).
// Unfortunately this is not a reliable method, depends
// on the size of shape.
// TODO: figure out why this happens!
- Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1,
- xx1,yy1,xx2,yy2);
+ Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2);
}
else
- Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
- xx1,yy1,xx2,yy2);
+ {
+ Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2);
+ }
- CalcBoundingBox((wxCoord)(xc-radius), (wxCoord)(yc-radius));
- CalcBoundingBox((wxCoord)(xc+radius), (wxCoord)(yc+radius));
+ CalcBoundingBox(xc - r, yc - r);
+ CalcBoundingBox(xc + r, yc + r);
+}
+
+void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+ wxCoord width, wxCoord height)
+{
+ wxCoord x2 = x1 + width,
+ y2 = y1 + height;
+
+#if defined(__WIN32__) && !defined(__SC__)
+ RECT rect;
+ rect.left = x1;
+ rect.top = y1;
+ rect.right = x2;
+ rect.bottom = y2;
+
+ DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
+#else // Win16
+ // In WIN16, draw a cross
+ HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
+ HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH);
+ HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen);
+ HPEN hBrushOld = (HPEN)::SelectObject(GetHdc(), whiteBrush);
+ ::SetROP2(GetHdc(), R2_COPYPEN);
+ Rectangle(GetHdc(), x1, y1, x2, y2);
+ MoveTo(GetHdc(), x1, y1);
+ LineTo(GetHdc(), x2, y2);
+ MoveTo(GetHdc(), x2, y1);
+ LineTo(GetHdc(), x1, y2);
+ ::SelectObject(GetHdc(), hPenOld);
+ ::SelectObject(GetHdc(), hBrushOld);
+ ::DeleteObject(blackPen);
+#endif // Win32/16
+
+ CalcBoundingBox(x1, y1);
+ CalcBoundingBox(x2, y2);
}
void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
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);
- }
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
// Do things less efficiently if we have offsets
if (xoffset != 0 || yoffset != 0)
(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[], wxCoord xoffset, wxCoord yoffset)
void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- COLORREF colFgOld = 0,
- colBgOld = 0;
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
- if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
- {
- colFgOld = ::GetTextColor(GetHdc());
- colBgOld = ::GetBkColor(GetHdc());
+ wxCoord x2 = x + width;
+ wxCoord y2 = y + height;
- 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_logicalFunction == wxCOPY) && (m_pen.GetStyle() == wxTRANSPARENT))
+ {
+ RECT rect;
+ rect.left = XLOG2DEV(x);
+ rect.top = YLOG2DEV(y);
+ rect.right = XLOG2DEV(x2);
+ rect.bottom = YLOG2DEV(y2);
+ (void)FillRect(GetHdc(), &rect, (HBRUSH)m_brush.GetResourceHandle() );
+ }
+ else
+ {
+ // Windows draws the filled rectangles without outline (i.e. drawn with a
+ // transparent pen) one pixel smaller in both directions and we want them
+ // to have the same size regardless of which pen is used - adjust
- if ( m_textBackgroundColour.Ok() )
+ // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR.
+ if ( m_pen.GetStyle() == wxTRANSPARENT )
{
- // 0 in mask becomes text color
- ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel());
+ x2++;
+ y2++;
}
- // VZ: IMHO this does strictly nothing here
- SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
- : OPAQUE);
- }
-
- wxCoord x2 = x + width;
- wxCoord y2 = y + height;
-
- // Windows draws the filled rectangles without outline (i.e. drawn with a
- // transparent pen) one pixel smaller in both directions and we want them
- // to have the same size regardless of which pen is used - adjust
- if ( m_pen.GetStyle() == wxTRANSPARENT )
- {
- x2++;
- y2++;
+ (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
}
- (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
CalcBoundingBox(x, y);
CalcBoundingBox(x2, y2);
-
- if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
- {
- // restore the colours we changed
- ::SetBkMode(GetHdc(), TRANSPARENT);
- ::SetTextColor(GetHdc(), colFgOld);
- ::SetBkColor(GetHdc(), colBgOld);
- }
}
void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
// Now, a negative radius value is interpreted to mean
// 'the proportion of the smallest X or Y dimension'
wxCoord x2 = (x+width);
wxCoord y2 = (y+height);
+ // Windows draws the filled rectangles without outline (i.e. drawn with a
+ // transparent pen) one pixel smaller in both directions and we want them
+ // to have the same size regardless of which pen is used - adjust
+ if ( m_pen.GetStyle() == wxTRANSPARENT )
+ {
+ x2++;
+ y2++;
+ }
+
(void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));
void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
wxCoord x2 = (x+width);
wxCoord y2 = (y+height);
// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
{
- wxCoord x2 = (x+w);
- wxCoord y2 = (y+h);
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+ wxCoord x2 = x + w;
+ wxCoord y2 = y + h;
int rx1 = XLOG2DEV(x+w/2);
int ry1 = YLOG2DEV(y+h/2);
// 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 = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
+ HPEN hpenOld = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
if (m_signY > 0)
{
(void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
- rx1, ry1, rx2, ry2);
+ rx1, ry1, rx2, ry2);
}
else
{
(void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
- rx1, ry1-1, rx2, ry2-1);
+ rx1, ry1-1, rx2, ry2-1);
}
- ::SelectObject(GetHdc(), orig_pen);
+
+ ::SelectObject(GetHdc(), hpenOld);
+
(void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
- rx1, ry1, rx2, ry2);
+ rx1, ry1, rx2, ry2);
CalcBoundingBox(x, y);
CalcBoundingBox(x2, y2);
{
wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
+#ifdef __WIN32__
+ ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
+#else
::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));
+#endif
CalcBoundingBox(x, y);
CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
HDC hdcMem = ::CreateCompatibleDC(GetHdc());
::SelectObject(hdcMem, GetHbitmapOf(bmp));
- // this will only work if the transparent part of our bitmap is black
- // because it is combined with the destination rectangle using OR, so
- // it won't be really transparent otherwise - I don't know what to do
- // about it, may be use MAKEROP4(SRCCOPY, DSTINVERT) twice? Or create a
- // copy of the bitmap with the transparent part replaced with black
- // pixels?
-
- // GRG: now this works regardless of what the source bitmap
- // contains in the area which is to be transparent.
- //
+ // use MaskBlt() with ROP which doesn't do anything to dst in the mask
+ // points
bool ok = ::MaskBlt(GetHdc(), x, y, width, height,
hdcMem, 0, 0,
hbmpMask, 0, 0,
- MAKEROP4(SRCCOPY, 0x00AA0029)) != 0;
+ MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
::DeleteDC(hdcMem);
if ( !ok )
#endif // Win32
{
- // VZ: this is incorrect, Blit() doesn't (and can't) draw
- // transparently, but it's still better than nothing at all
- // GRG: Blit() *should* draw transparently when there is a mask
-
- // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
+ // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
+ // level
wxMemoryDC memDC;
memDC.SelectObject(bmp);
if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
text.c_str(), text.length()) == 0 )
{
- wxLogLastError("TextOut");
+ wxLogLastError(wxT("TextOut"));
}
// restore the old parameters (text foreground colour may be left because
LOGFONT lf;
if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
{
- wxLogLastError("GetObject(hfont)");
+ wxLogLastError(wxT("GetObject(hfont)"));
}
// GDI wants the angle in tenth of degree
hfont = ::CreateFontIndirect(&lf);
if ( !hfont )
{
- wxLogLastError("CreateFont");
+ wxLogLastError(wxT("CreateFont"));
}
else
{
if (m_brush.Ok())
{
- if (m_brush.GetResourceHandle())
+ // to make sure the brush is alligned with the logical coordinates
+ wxBitmap *stipple = m_brush.GetStipple();
+ if ( stipple && stipple->Ok() )
+ {
+#ifdef __WIN32__
+ ::SetBrushOrgEx(GetHdc(),
+ m_deviceOriginX % stipple->GetWidth(),
+ m_deviceOriginY % stipple->GetHeight(),
+ NULL); // don't need previous brush origin
+#else
+ ::SetBrushOrg(GetHdc(),
+ m_deviceOriginX % stipple->GetWidth(),
+ m_deviceOriginY % stipple->GetHeight());
+#endif
+ }
+
+ if ( m_brush.GetResourceHandle() )
{
HBRUSH b = 0;
b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());
::SetBkMode(GetHdc(), TRANSPARENT);
else
::SetBkMode(GetHdc(), OPAQUE);
+ Last change: AC 29 Jan 101 8:54 pm
*/
}
switch (m_logicalFunction)
{
+ case wxCLEAR: rop = R2_BLACK; break;
case wxXOR: rop = R2_XORPEN; break;
case wxINVERT: rop = R2_NOT; break;
case wxOR_REVERSE: rop = R2_MERGEPENNOT; break;
case wxAND_REVERSE: rop = R2_MASKPENNOT; break;
- case wxCLEAR: rop = R2_WHITE; break;
- case wxSET: rop = R2_BLACK; break;
- case wxOR_INVERT: rop = R2_MERGENOTPEN; break;
+ case wxCOPY: rop = R2_COPYPEN; break;
case wxAND: rop = R2_MASKPEN; break;
- case wxOR: rop = R2_MERGEPEN; break;
- case wxEQUIV: rop = R2_NOTXORPEN; break;
- case wxNAND: rop = R2_NOTMASKPEN; break;
case wxAND_INVERT: rop = R2_MASKNOTPEN; break;
- case wxCOPY: rop = R2_COPYPEN; break;
case wxNO_OP: rop = R2_NOP; break;
- case wxSRC_INVERT: rop = R2_NOTCOPYPEN; break;
case wxNOR: rop = R2_NOTMERGEPEN; break;
+ case wxEQUIV: rop = R2_NOTXORPEN; break;
+ case wxSRC_INVERT: rop = R2_NOTCOPYPEN; break;
+ case wxOR_INVERT: rop = R2_MERGENOTPEN; break;
+ case wxNAND: rop = R2_NOTMASKPEN; break;
+ case wxOR: rop = R2_MERGEPEN; break;
+ case wxSET: rop = R2_WHITE; break;
+
default:
wxFAIL_MSG( wxT("unsupported logical function") );
return;
wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
{
- return (wxCoord) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX);
+ double xRel = x - m_deviceOriginX;
+ xRel /= m_logicalScaleX*m_userScaleX*m_signX*m_scaleX;
+ return (wxCoord)(xRel + m_logicalOriginX);
}
wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
{
- return (wxCoord) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY);
+ double yRel = y - m_deviceOriginY;
+ yRel /= m_logicalScaleY*m_userScaleY*m_signY*m_scaleY;
+ return (wxCoord)(yRel + m_logicalOriginY);
}
wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
case wxNAND: dwRop = 0x007700E6; break;
case wxAND_INVERT: dwRop = 0x00220326; break;
case wxCOPY: dwRop = SRCCOPY; break;
- case wxNO_OP: dwRop = 0x00AA0029; break;
+ case wxNO_OP: dwRop = DSTCOPY; break;
case wxSRC_INVERT: dwRop = NOTSRCCOPY; break;
case wxNOR: dwRop = NOTSRCCOPY; break;
default:
if (useMask)
{
#ifdef __WIN32__
- // prepare the mask bitmap
- HBITMAP hbmpMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
-
- // select the correct brush: the current one by default, background one
- // if none
- HBRUSH hbrNew;
- if ( m_brush.Ok() )
- {
- hbrNew = (HBRUSH)m_brush.GetResourceHandle();
- }
- else if ( m_backgroundBrush.Ok() )
- {
- hbrNew = (HBRUSH)m_backgroundBrush.GetResourceHandle();
- }
- else
- {
- hbrNew = 0;
- }
-
- HGDIOBJ hbrOld = hbrNew ? ::SelectObject(GetHdc(), hbrNew) : 0;
-
// we want the part of the image corresponding to the mask to be
- // transparent, i.e. do PATCOPY there and apply dwRop elsewhere
-
- // GRG: PATCOPY is not transparent, as can be seen when blitting
- // over a pattern: the 'transparent' area would be filled
- // with the selected colour. We should use NOP instead, or
- // do MaskBlt + BitBlt.
- //
+ // transparent, so use "DSTCOPY" ROP for the mask points (the usual
+ // meaning of fg and bg is inverted which corresponds to wxWin notion
+ // of the mask which is also contrary to the Windows one)
success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
GetHdcOf(*source), xsrc, ysrc,
- hbmpMask, 0, 0,
- MAKEROP4(0x00AA0029, dwRop)) != 0;
-
- if ( hbrNew )
- {
- (void)::SelectObject(GetHdc(), hbrOld);
- }
-
- ::DeleteObject(hbmpMask);
+ (HBITMAP)mask->GetMaskBitmap(), xsrc, ysrc,
+ MAKEROP4(dwRop, DSTCOPY)) != 0;
if ( !success )
#endif // Win32
if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
GetHdc(), xdest, ydest, SRCCOPY) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// copy src to buffer using selected raster op
if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
GetHdcOf(*source), xsrc, ysrc, dwRop) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// set masked area in buffer to BLACK (pixel value 0)
if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
dc_mask, xsrc, ysrc, SRCAND) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// set unmasked area in dest to BLACK
if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
dc_mask, xsrc, ysrc, SRCAND) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values
::SetTextColor(GetHdc(), prevCol);
dc_buffer, 0, 0, SRCPAINT) != 0;
if ( !success )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// tidy up temporary DCs and bitmap
GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
if ( !success )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
}
::SetTextColor(GetHdc(), old_textground);
projects / wxWidgets.git / blobdiff