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

Applied patch [ 717012 ] dcclient draw_lines fix for vectors of short lines

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-11 10:19:57 +00:00
parent 81a2efbead
commit e791ef24ac
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/dcclient.cpp
View File

@@ -689,20 +689,28 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
if (m_pen.GetStyle() == wxTRANSPARENT) return;
if (n <= 0) return;
CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
GdkPoint *gpts = new GdkPoint[n];
if (! gpts)
{
wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
return;
}
for (int i = 0; i < n-1; i++)
for (int i = 0; i < n; i++)
{
wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
wxCoord x2 = XLOG2DEV(points[i+1].x + xoffset);
wxCoord y1 = YLOG2DEV(points[i].y + yoffset); // oh, what a waste
wxCoord y2 = YLOG2DEV(points[i+1].y + yoffset);
wxCoord y1 = YLOG2DEV(points[i].y + yoffset);
if (m_window)
gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
CalcBoundingBox( x1 + xoffset, y1 + yoffset );
CalcBoundingBox( points[i+1].x + xoffset, points[i+1].y + yoffset );
gpts[i].x = x1;
gpts[i].y = y1;
}
if (m_window)
gdk_draw_lines( m_window, m_penGC, gpts, n);
delete[] gpts;
}
void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )

24
src/gtk1/dcclient.cpp
View File

@@ -689,20 +689,28 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
if (m_pen.GetStyle() == wxTRANSPARENT) return;
if (n <= 0) return;
CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
GdkPoint *gpts = new GdkPoint[n];
if (! gpts)
{
wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
return;
}
for (int i = 0; i < n-1; i++)
for (int i = 0; i < n; i++)
{
wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
wxCoord x2 = XLOG2DEV(points[i+1].x + xoffset);
wxCoord y1 = YLOG2DEV(points[i].y + yoffset); // oh, what a waste
wxCoord y2 = YLOG2DEV(points[i+1].y + yoffset);
wxCoord y1 = YLOG2DEV(points[i].y + yoffset);
if (m_window)
gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
CalcBoundingBox( x1 + xoffset, y1 + yoffset );
CalcBoundingBox( points[i+1].x + xoffset, points[i+1].y + yoffset );
gpts[i].x = x1;
gpts[i].y = y1;
}
if (m_window)
gdk_draw_lines( m_window, m_penGC, gpts, n);
delete[] gpts;
}
void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )