X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68f64b40bfdffd1fc4967dc422a7d89b42545d82..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/generic/dcpsg.cpp

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index b340cd4efb..2c8e9c3339 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -597,7 +597,7 @@ void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y)
     CalcBoundingBox( x, y );
 }
 
-void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
+void wxPostScriptDCImpl::DoDrawPolygon (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -667,7 +667,7 @@ void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset
     }
 }
 
-void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
+void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, const int count[], const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -743,7 +743,7 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[]
     }
 }
 
-void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxPostScriptDCImpl::DoDrawLines (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -968,11 +968,11 @@ void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!bitmap.Ok()) return;
+    if (!bitmap.IsOk()) return;
 
     wxImage image = bitmap.ConvertToImage();
 
-    if (!image.Ok()) return;
+    if (!image.IsOk()) return;
 
     wxCoord w = image.GetWidth();
     wxCoord h = image.GetHeight();
@@ -1038,7 +1038,7 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!font.Ok())  return;
+    if (!font.IsOk())  return;
 
     m_font = font;
 
@@ -1133,11 +1133,15 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!pen.Ok()) return;
+    if (!pen.IsOk()) return;
 
-    int oldStyle = m_pen.GetStyle();
+    int oldStyle = m_pen.IsOk() ? m_pen.GetStyle() : wxPENSTYLE_INVALID;
+    wxPenCap oldCap = m_pen.IsOk() ? m_pen.GetCap() : wxCAP_INVALID;
+    wxPenJoin oldJoin = m_pen.IsOk() ? m_pen.GetJoin() : wxJOIN_INVALID;
 
     m_pen = pen;
+    wxPenCap cap = m_pen.IsOk() ? m_pen.GetCap() : wxCAP_INVALID;
+    wxPenJoin join = m_pen.IsOk() ? m_pen.GetJoin() : wxJOIN_INVALID;
 
     double width;
 
@@ -1201,6 +1205,35 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
         PsPrint( " setdash\n" );
     }
 
+    if ( cap != wxCAP_INVALID && cap != oldCap )
+    {
+        switch ( cap )
+        {
+            case wxCAP_ROUND:      buffer = "1"; break;
+            case wxCAP_PROJECTING: buffer = "2"; break;
+            case wxCAP_BUTT:       buffer = "0"; break;
+
+            // This case is just to fix compiler warning, this is impossible
+            // due to the test above.
+            case wxCAP_INVALID: break;
+        }
+        buffer << " setlinecap\n";
+        PsPrint( buffer );
+    }
+
+    if ( join != wxJOIN_INVALID && join != oldJoin )
+    {
+        switch ( join )
+        {
+            case wxJOIN_BEVEL: buffer = "2"; break;
+            case wxJOIN_ROUND: buffer = "1"; break;
+            case wxJOIN_MITER: buffer = "0"; break;
+            case wxJOIN_INVALID: break;
+        }
+        buffer << " setlinejoin\n";
+        PsPrint( buffer );
+    }
+
     // Line colour
     unsigned char red = m_pen.GetColour().Red();
     unsigned char blue = m_pen.GetColour().Blue();
@@ -1240,7 +1273,7 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!brush.Ok()) return;
+    if (!brush.IsOk()) return;
 
     m_brush = brush;
 
@@ -1288,7 +1321,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
     if ( !textbuf )
         return;
 
-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())
     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();
@@ -1398,7 +1431,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
 
     SetFont( m_font );
 
-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())
     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();
@@ -1957,7 +1990,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
 
 wxCoord wxPostScriptDCImpl::GetCharHeight() const
 {
-    if (m_font.Ok())
+    if (m_font.IsOk())
         return m_font.GetPointSize();
     else
         return 12;
@@ -2055,7 +2088,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
     /  example:
     /
     /    wxPostScriptDC dc(NULL, true);
-    /    if (dc.Ok()){
+    /    if (dc.IsOk()){
     /      wxSetAFMPath("d:\\wxw161\\afm\\");
     /      dc.StartDoc("Test");
     /      dc.StartPage();