AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected hatched brushes emulation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2002-01-01 09:58:11 +00:00
parent 2b65eb68b8
commit 75f7bc3bb4
2 changed files with 52 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/mac/carbon/dc.cpp
View File

@ -778,8 +778,9 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[],
wxCoord x1, x2 , y1 , y2 ;
if (m_brush.GetStyle() != wxTRANSPARENT)
{
if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
return ;
PolyHandle polygon = OpenPoly();
x1 = XLOG2DEVMAC(points[0].x + xoffset);
@ -795,37 +796,22 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[],
ClosePoly();
if (m_brush.GetStyle() != wxTRANSPARENT)
{
MacInstallBrush();
::PaintPoly( polygon );
KillPoly( polygon );
}
if (m_pen.GetStyle() != wxTRANSPARENT)
{
PolyHandle polygon = OpenPoly();
x1 = XLOG2DEVMAC(points[0].x + xoffset);
y1 = YLOG2DEVMAC(points[0].y + yoffset);
::MoveTo(x1,y1);
for (int i = 0; i < n-1; i++)
{
x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
::LineTo(x2, y2);
}
// return to origin to close path
::LineTo(x1,y1);
ClosePoly();
MacInstallPen() ;
::FramePoly( polygon ) ;
KillPoly( polygon );
}
KillPoly( polygon );
}
void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
@ -1445,27 +1431,28 @@ void wxDC::MacInstallFont() const
static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
{
int thePatListID = sysPatListID;
// we have our own pattern list now
int thePatListID = 128;
int theIndex;
switch(hatchStyle)
{
case wxBDIAGONAL_HATCH:
theIndex = 34; // WCH: this is not good
theIndex = 2;
break;
case wxFDIAGONAL_HATCH:
theIndex = 26;
theIndex = 3;
break;
case wxCROSS_HATCH:
theIndex = 5;
theIndex = 4;
break;
case wxHORIZONTAL_HATCH:
theIndex = 25;
theIndex = 5;
break;
case wxVERTICAL_HATCH:
theIndex = 6;
break;
case wxCROSSDIAG_HATCH:
theIndex = 4; // WCH: this is not good
theIndex = 7;
break;
default:
theIndex = 1; // solid pattern

41
src/mac/dc.cpp
View File

@ -778,8 +778,9 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[],
wxCoord x1, x2 , y1 , y2 ;
if (m_brush.GetStyle() != wxTRANSPARENT)
{
if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
return ;
PolyHandle polygon = OpenPoly();
x1 = XLOG2DEVMAC(points[0].x + xoffset);
@ -795,37 +796,22 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[],
ClosePoly();
if (m_brush.GetStyle() != wxTRANSPARENT)
{
MacInstallBrush();
::PaintPoly( polygon );
KillPoly( polygon );
}
if (m_pen.GetStyle() != wxTRANSPARENT)
{
PolyHandle polygon = OpenPoly();
x1 = XLOG2DEVMAC(points[0].x + xoffset);
y1 = YLOG2DEVMAC(points[0].y + yoffset);
::MoveTo(x1,y1);
for (int i = 0; i < n-1; i++)
{
x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
::LineTo(x2, y2);
}
// return to origin to close path
::LineTo(x1,y1);
ClosePoly();
MacInstallPen() ;
::FramePoly( polygon ) ;
KillPoly( polygon );
}
KillPoly( polygon );
}
void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
@ -1445,27 +1431,28 @@ void wxDC::MacInstallFont() const
static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
{
int thePatListID = sysPatListID;
// we have our own pattern list now
int thePatListID = 128;
int theIndex;
switch(hatchStyle)
{
case wxBDIAGONAL_HATCH:
theIndex = 34; // WCH: this is not good
theIndex = 2;
break;
case wxFDIAGONAL_HATCH:
theIndex = 26;
theIndex = 3;
break;
case wxCROSS_HATCH:
theIndex = 5;
theIndex = 4;
break;
case wxHORIZONTAL_HATCH:
theIndex = 25;
theIndex = 5;
break;
case wxVERTICAL_HATCH:
theIndex = 6;
break;
case wxCROSSDIAG_HATCH:
theIndex = 4; // WCH: this is not good
theIndex = 7;
break;
default:
theIndex = 1; // solid pattern