X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b52e49f51ce18b63970ff2661dfe6476c43615b7..38bb138f09688c1575766aafdbf296dfeeee0d7d:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index f4df4fc183..5b5ad1c2f7 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -1564,7 +1564,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) double a, b, c, d, x1, y1, x2, y2, x3, y3; wxPoint *p, *q; - wxNode *node = points->GetFirst(); + wxList::compatibility_iterator node = points->GetFirst(); p = (wxPoint *)node->GetData(); x1 = p->x; y1 = p->y; @@ -1586,7 +1586,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); - while ((node = node->GetNext()) != NULL) + while ((node = node->GetNext())) { q = (wxPoint *)node->GetData(); @@ -1745,7 +1745,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) // fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); - char *paper = "A4"; + const char *paper; switch (m_printData.GetPaperId()) { case wxPAPER_LETTER: paper = "Letter"; break; // Letter: paper ""; 8 1/2 by 11 inches @@ -2320,7 +2320,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if(lastWidths[*p]== INT_MIN) { wxLogDebug(wxT("GetTextExtent: undefined width for character '%c' (%d)"), *p,*p); - sum += lastWidths[' ']; /* assume space */ + sum += lastWidths[(unsigned char)' ']; /* assume space */ } else {