Blit code for masks

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

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 4c8282197097d09b3a27852f7dde7c3fb474f507..43bc9720fe83f02244eef99ee9a9da7b6e8175fc 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -1445,6 +1445,11 @@ bool wxDC::DoBlit(
                                                       ,vXsrc + vWidth, vYsrc + vHeight
                                                      };
         POINTL                          aPoint3[4] = { vXdest, vYdest
                                                       ,vXsrc + vWidth, vYsrc + vHeight
                                                      };
         POINTL                          aPoint3[4] = { vXdest, vYdest

+                                                      ,vXdest + vWidth, vYdest + vHeight
+                                                      ,vXsrc, vYsrc
+                                                      ,vXsrc + vWidth, vYsrc + vHeight
+                                                     };
+        POINTL                          aPoint4[4] = { vXdest, vYdest

                                                       ,vXdest + vWidth, vYdest + vHeight
                                                       ,0, 0
                                                       ,vWidth, vHeight
                                                       ,vXdest + vWidth, vYdest + vHeight
                                                       ,0, 0
                                                       ,vWidth, vHeight


@@ -1511,7 +1516,7 @@ bool wxDC::DoBlit(
         rc = ::GpiBitBlt( GetHPS()
                          ,hPSMask
                          ,4L
         rc = ::GpiBitBlt( GetHPS()
                          ,hPSMask
                          ,4L

-                         ,aPoint2
+                         ,aPoint3

                          ,ROP_SRCAND
                          ,BBO_IGNORE
                         );
                          ,ROP_SRCAND
                          ,BBO_IGNORE
                         );


@@ -1532,7 +1537,7 @@ bool wxDC::DoBlit(
         rc = ::GpiBitBlt( GetHPS()
                          ,hPSMask
                          ,4L
         rc = ::GpiBitBlt( GetHPS()
                          ,hPSMask
                          ,4L

-                         ,aPoint2
+                         ,aPoint4

                          ,ROP_SRCPAINT
                          ,BBO_IGNORE
                         );
                          ,ROP_SRCPAINT
                          ,BBO_IGNORE
                         );