Corrected DoBlit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 535e7ec7295e37a37ec798ff06d67a1006c01f14..fb1b61bce2164d3d593241e79f7be324b22d85dd 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -79,7 +79,8 @@ public:
   void DoDrawSpline(wxList *points);
 
   bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
   void DoDrawSpline(wxList *points);
 
   bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = FALSE);
+            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = FALSE,
+            wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

   bool CanDrawBitmap() const { return TRUE; }
 
   void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
   bool CanDrawBitmap() const { return TRUE; }
 
   void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index c4b04b06560ce32e241158389d11f5c06c3e9b99..73ee7231f032540927894482e562fe69d4b6f2b7 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1835,7 +1835,7 @@ bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,

-                           int rop, bool WXUNUSED(useMask) )
+                           int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )

 {
     wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") );
 
 {
     wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") );