Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't duplicate wxDCBase::DoDrawCheckMark() code in wxDC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-19 01:22:30 +00:00
parent 3061e2fb50
commit b76d9e767e
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/msw/dc.cpp
View File

@@ -724,12 +724,13 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
wxCoord width, wxCoord height) wxCoord width, wxCoord height)
{ {
WXMICROWIN_CHECK_HDC // cases when we don't have DrawFrameControl()
#if defined(__SYMANTEC__) || defined(__WXMICROWIN__)
return wxDCBase::DoDrawCheckMark(x1, y1, width, height);
#else // normal case
wxCoord x2 = x1 + width, wxCoord x2 = x1 + width,
y2 = y1 + height; y2 = y1 + height;
#if defined(__WIN32__) && !defined(__SYMANTEC__) && !defined(__WXMICROWIN__)
RECT rect; RECT rect;
rect.left = x1; rect.left = x1;
rect.top = y1; rect.top = y1;
@@ -741,25 +742,10 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
#else #else
DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK); DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
#endif #endif
#else // Symantec-MicroWin
// 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);
MoveToEx(GetHdc(), x1, y1, NULL);
LineTo(GetHdc(), x2, y2);
MoveToEx(GetHdc(), x2, y1, NULL);
LineTo(GetHdc(), x1, y2);
::SelectObject(GetHdc(), hPenOld);
::SelectObject(GetHdc(), hBrushOld);
::DeleteObject(blackPen);
#endif // Win32/Symantec-MicroWin
CalcBoundingBox(x1, y1); CalcBoundingBox(x1, y1);
CalcBoundingBox(x2, y2); CalcBoundingBox(x2, y2);
#endif // Microwin/Normal
} }
void wxDC::DoDrawPoint(wxCoord x, wxCoord y) void wxDC::DoDrawPoint(wxCoord x, wxCoord y)