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

removed warning about wxDrawRectangle being unused

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-04 23:21:53 +00:00
parent 5c8fc7c1de
commit 983a384436
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/dcmemory.cpp
View File

@@ -139,6 +139,13 @@ void wxMemoryDC::DoGetSize(int *width, int *height) const
} }
} }
// the rest of this file deals with drawing rectangles workaround, disabled by
// default
#define wxUSE_MEMORY_DC_DRAW_RECTANGLE 0
#if wxUSE_MEMORY_DC_DRAW_RECTANGLE
// For some reason, drawing a rectangle on a memory DC has problems. // For some reason, drawing a rectangle on a memory DC has problems.
// Use this substitute if we can. // Use this substitute if we can.
static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoord height) static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoord height)
@@ -167,11 +174,13 @@ static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoo
} }
} }
#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{ {
// Set this to 1 to work around an apparent video driver bug // Set this to 1 to work around an apparent video driver bug
// (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample) // (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample)
#if 0 #if wxUSE_MEMORY_DC_DRAW_RECTANGLE
if (m_brush.Ok() && m_pen.Ok() && if (m_brush.Ok() && m_pen.Ok() &&
(m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) && (m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) &&
(m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) && (m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) &&
@@ -180,11 +189,9 @@ void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord he
wxDrawRectangle(* this, x, y, width, height); wxDrawRectangle(* this, x, y, width, height);
} }
else else
#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
{ {
wxDC::DoDrawRectangle(x, y, width, height); wxDC::DoDrawRectangle(x, y, width, height);
} }
#else
wxDC::DoDrawRectangle(x, y, width, height);
#endif
} }