Added a SetFont method that behaves like SetLabel does with respect to

[wxWidgets.git] / src / msw / dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index b9d10eac95b4f20dc50d28cbf4e02df351e75ba2..47f15ad28dbc3ba52a6c9f0562b832453ef4d440 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1115,6 +1115,7 @@ void wxDC::SetBackgroundMode(int mode)
         ::SetBkMode(GetHdc(), TRANSPARENT);
     else
         ::SetBkMode(GetHdc(), OPAQUE);
         ::SetBkMode(GetHdc(), TRANSPARENT);
     else
         ::SetBkMode(GetHdc(), OPAQUE);

+       Last change:  AC   29 Jan 101    8:54 pm

 */
 }
 
 */
 }
 


@@ -1440,7 +1441,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         // of the mask which is also contrary to the Windows one)
         success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
                             GetHdcOf(*source), xsrc, ysrc,
         // of the mask which is also contrary to the Windows one)
         success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
                             GetHdcOf(*source), xsrc, ysrc,

-                            (HBITMAP)mask->GetMaskBitmap(), 0, 0,
+                            (HBITMAP)mask->GetMaskBitmap(), xsrc, ysrc,

                             MAKEROP4(dwRop, DSTCOPY)) != 0;
 
         if ( !success )
                             MAKEROP4(dwRop, DSTCOPY)) != 0;
 
         if ( !success )