From cdc004a9413861d7cb4f95009f5d718a26b368e4 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 7 Aug 2019 20:20:06 +0200 Subject: [PATCH] Use generic DrawCheckMark in MSW wxDC Use the generic implementation, so it looks like the check marks on all other platforms and graphics contexts and not like a Windows control. --- include/wx/msw/dc.h | 2 -- src/msw/dc.cpp | 18 ------------------ 2 files changed, 20 deletions(-) diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index e541499f9a..a27b70dab3 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -202,8 +202,6 @@ public: virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) wxOVERRIDE; - virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea) wxOVERRIDE; diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index ddeb2d6ba9..1c97f14415 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -861,24 +861,6 @@ void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, CalcBoundingBox(xc + r, yc + r); } -void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, - wxCoord width, wxCoord height) -{ - wxCoord x2 = x1 + width, - y2 = y1 + height; - - RECT rect; - rect.left = x1; - rect.top = y1; - rect.right = x2; - rect.bottom = y2; - - DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK); - - CalcBoundingBox(x1, y1); - CalcBoundingBox(x2, y2); -} - void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y) { COLORREF color = 0x00ffffff;