Add wx{Pen,Brush}::Is[Non]Transparent() methods and use them.
Using GetStyle() == wx{PEN,BRUSH}STYLE_TRANSPARENT doesn't work for uninitialized pen or brush objects so add convenient helpers which do work for them. Use the new helper functions everywhere instead of explicitly checking for style. This makes the code shorter and more clear and also fixes some bugs (at least those in GTK printing code). Notice that this patch removes the main reason for explicitly initializing m_pen and m_brush in wxGTKDCImpl ctor but this initialization still can't be removed, at least for the latter, as doing this somehow breaks GetPixel(). It would be nice to understand why and do remove this initialization so that a newly created DC doesn't have any non-default pen nor brush. Closes #12522. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -723,7 +723,7 @@ void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
|
||||
wxCoord xxx2 = (wxCoord) (xxc+ray);
|
||||
wxCoord yyy2 = (wxCoord) (yyc+ray);
|
||||
|
||||
if ( m_brush.IsOk() && m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )
|
||||
if ( m_brush.IsNonTransparent() )
|
||||
{
|
||||
// Have to add 1 to bottom-right corner of rectangle
|
||||
// to make semi-circles look right (crooked line otherwise).
|
||||
@@ -931,7 +931,7 @@ void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
|
||||
// (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
|
||||
#ifndef __WXWINCE__
|
||||
if ( m_pen.IsOk() && m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
|
||||
if ( m_pen.IsTransparent() )
|
||||
{
|
||||
x2dev++;
|
||||
y2dev++;
|
||||
@@ -965,7 +965,7 @@ void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx
|
||||
// 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.IsOk() && m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
|
||||
if ( m_pen.IsTransparent() )
|
||||
{
|
||||
x2++;
|
||||
y2++;
|
||||
|
Reference in New Issue
Block a user