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

String corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-02-12 13:29:55 +00:00
parent a0d924c696
commit bdbcded6a3
1 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
src/generic/dcpsg.cpp
View File

@@ -355,12 +355,12 @@ void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoo
m_clipping = TRUE; m_clipping = TRUE;
PsPrintf( wxT("gsave\n newpath\n" PsPrintf( wxT("gsave\n newpath\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"closepath clip newpath\n"), wxT("closepath clip newpath\n"),
LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceX(x), LogicalToDeviceY(y),
LogicalToDeviceX(x+w), LogicalToDeviceY(y), LogicalToDeviceX(x+w), LogicalToDeviceY(y),
LogicalToDeviceX(x+w), LogicalToDeviceY(y+h), LogicalToDeviceX(x+w), LogicalToDeviceY(y+h),
@@ -413,10 +413,10 @@ void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
SetPen( m_pen ); SetPen( m_pen );
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"stroke\n"), wxT("stroke\n"),
LogicalToDeviceX(x1), LogicalToDeviceY(y1), LogicalToDeviceX(x1), LogicalToDeviceY(y1),
LogicalToDeviceX(x2), LogicalToDeviceY (y2) ); LogicalToDeviceX(x2), LogicalToDeviceY (y2) );
@@ -462,11 +462,11 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
{ {
SetBrush( m_brush ); SetBrush( m_brush );
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d %d %d %d ellipse\n" wxT("%d %d %d %d %d %d ellipse\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"closepath\n" wxT("closepath\n")
"fill\n"), wxT("fill\n"),
LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
@@ -478,11 +478,11 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
{ {
SetPen( m_pen ); SetPen( m_pen );
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d %d %d %d ellipse\n" wxT("%d %d %d %d %d %d ellipse\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"stroke\n" wxT("stroke\n")
"fill\n"), wxT("fill\n"),
LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
@@ -510,8 +510,8 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
{ {
SetBrush( m_brush ); SetBrush( m_brush );
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d %d %d %d true ellipticarc\n"), wxT("%d %d %d %d %d %d true ellipticarc\n"),
LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2),
LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2),
(wxCoord)sa, (wxCoord)ea ); (wxCoord)sa, (wxCoord)ea );
@@ -524,8 +524,8 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
{ {
SetPen( m_pen ); SetPen( m_pen );
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d %d %d %d false ellipticarc\n"), wxT("%d %d %d %d %d %d false ellipticarc\n"),
LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2),
LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2),
(wxCoord)sa, (wxCoord)ea ); (wxCoord)sa, (wxCoord)ea );
@@ -543,10 +543,10 @@ void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
SetPen (m_pen); SetPen (m_pen);
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"stroke\n"), wxT("stroke\n"),
LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceX(x), LogicalToDeviceY(y),
LogicalToDeviceX(x+1), LogicalToDeviceY(y) ); LogicalToDeviceX(x+1), LogicalToDeviceY(y) );
@@ -718,13 +718,13 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
{ {
SetBrush( m_brush ); SetBrush( m_brush );
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"closepath\n" wxT("closepath\n")
"fill\n"), wxT("fill\n"),
LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceX(x), LogicalToDeviceY(y),
LogicalToDeviceX(x + width), LogicalToDeviceY(y), LogicalToDeviceX(x + width), LogicalToDeviceY(y),
LogicalToDeviceX(x + width), LogicalToDeviceY(y + height), LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
@@ -738,13 +738,13 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
{ {
SetPen (m_pen); SetPen (m_pen);
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"closepath\n" wxT("closepath\n")
"stroke\n"), wxT("stroke\n"),
LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceX(x), LogicalToDeviceY(y),
LogicalToDeviceX(x + width), LogicalToDeviceY(y), LogicalToDeviceX(x + width), LogicalToDeviceY(y),
LogicalToDeviceX(x + width), LogicalToDeviceY(y + height), LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
@@ -774,17 +774,17 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
SetBrush( m_brush ); SetBrush( m_brush );
/* Draw rectangle anticlockwise */ /* Draw rectangle anticlockwise */
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d 90 180 arc\n" wxT("%d %d %d 90 180 arc\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d %d 180 270 arc\n" wxT("%d %d %d 180 270 arc\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d %d 270 0 arc\n" wxT("%d %d %d 270 0 arc\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d %d 0 90 arc\n" wxT("%d %d %d 0 90 arc\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"closepath\n" wxT("closepath\n")
"fill\n"), wxT("fill\n"),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad), LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
LogicalToDeviceX(x), LogicalToDeviceY(y + rad), LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad), LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
@@ -803,17 +803,17 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
SetPen (m_pen); SetPen (m_pen);
/* Draw rectangle anticlockwise */ /* Draw rectangle anticlockwise */
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d 90 180 arc\n" wxT("%d %d %d 90 180 arc\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d %d 180 270 arc\n" wxT("%d %d %d 180 270 arc\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d %d 270 0 arc\n" wxT("%d %d %d 270 0 arc\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"%d %d %d 0 90 arc\n" wxT("%d %d %d 0 90 arc\n")
"%d %d lineto\n" wxT("%d %d lineto\n")
"closepath\n" wxT("closepath\n")
"stroke\n"), wxT("stroke\n"),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad), LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
LogicalToDeviceX(x), LogicalToDeviceY(y + rad), LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad), LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
@@ -836,9 +836,9 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
{ {
SetBrush (m_brush); SetBrush (m_brush);
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d %d 0 360 ellipse\n" wxT("%d %d %d %d 0 360 ellipse\n")
"fill\n"), wxT("fill\n"),
LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2), LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) ); LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
@@ -850,9 +850,9 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
{ {
SetPen (m_pen); SetPen (m_pen);
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d %d %d 0 360 ellipse\n" wxT("%d %d %d %d 0 360 ellipse\n")
"stroke\n"), wxT("stroke\n"),
LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2), LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) ); LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
@@ -888,18 +888,18 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
wxCoord xx = LogicalToDeviceX(x); wxCoord xx = LogicalToDeviceX(x);
wxCoord yy = LogicalToDeviceY(y + bitmap.GetHeight()); wxCoord yy = LogicalToDeviceY(y + bitmap.GetHeight());
PsPrintf( wxT("/origstate save def\n" PsPrintf( wxT("/origstate save def\n")
"20 dict begin\n" wxT("20 dict begin\n")
"/pix %d string def\n" wxT("/pix %d string def\n")
"/grays %d string def\n" wxT("/grays %d string def\n")
"/npixels 0 def\n" wxT("/npixels 0 def\n")
"/rgbindx 0 def\n" wxT("/rgbindx 0 def\n")
"%d %d translate\n" wxT("%d %d translate\n")
"%d %d scale\n" wxT("%d %d scale\n")
"%d %d 8\n" wxT("%d %d 8\n")
"[%d 0 0 %d 0 %d]\n" wxT("[%d 0 0 %d 0 %d]\n")
"{currentfile pix readhexstring pop}\n" wxT("{currentfile pix readhexstring pop}\n")
"false 3 colorimage\n"), wxT("false 3 colorimage\n"),
w, w, xx, yy, ww, hh, w, h, w, -h, h ); w, w, xx, yy, ww, hh, w, h, w, -h, h );
unsigned char* data = image.GetData(); unsigned char* data = image.GetData();
@@ -1634,9 +1634,9 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
#endif #endif
(double)(y1 + d) / 2; (double)(y1 + d) / 2;
PsPrintf( wxT("newpath\n" PsPrintf( wxT("newpath\n")
"%d %d moveto\n" wxT("%d %d moveto\n")
"%d %d lineto\n"), wxT("%d %d lineto\n"),
LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );