1. implemented wxRegKey::Copy() and CopyValue()

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 91443fae020f077014e65e5ef067f25d45de3ba1..5190c3b350d466a5c902f0096eb7bdf41c3ebf29 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -48,9 +48,6 @@
 #include "wx/msw/private.h" // needs to be before #include <commdlg.h>
 
 #if wxUSE_COMMON_DIALOGS
 #include "wx/msw/private.h" // needs to be before #include <commdlg.h>
 
 #if wxUSE_COMMON_DIALOGS

-#if wxUSE_NORLANDER_HEADERS
-    #include <windows.h>
-#endif

     #include <commdlg.h>
 #endif
 
     #include <commdlg.h>
 #endif
 


@@ -74,6 +71,10 @@ static const int MM_METRIC = 10;
     static const double M_PI = 3.14159265358979323846;
 #endif // M_PI
 
     static const double M_PI = 3.14159265358979323846;
 #endif // M_PI
 

+// ROPs which don't have standard names (see "Ternary Raster Operations" in the
+// MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
+#define DSTCOPY 0x00AA0029      // a.k.a. NOP operation
+

 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------


@@ -546,8 +547,8 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     // to have the same size regardless of which pen is used - adjust
     if ( m_pen.GetStyle() == wxTRANSPARENT )
     {
     // to have the same size regardless of which pen is used - adjust
     if ( m_pen.GetStyle() == wxTRANSPARENT )
     {

-        x2++;
-        y2++;
+//        x2++;
+//        y2++;

     }
 
     (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
     }
 
     (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));


@@ -657,7 +658,50 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
 

-    if ( !useMask )
+    HBITMAP hbmpMask = 0;
+
+    if ( useMask )
+    {
+        wxMask *mask = bmp.GetMask();
+        if ( mask )
+            hbmpMask = (HBITMAP)mask->GetMaskBitmap();
+
+        if ( !hbmpMask )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = FALSE;
+        }
+    }
+
+    if ( useMask )
+    {
+#ifdef __WIN32__
+        HDC hdcMem = ::CreateCompatibleDC(GetHdc());
+        ::SelectObject(hdcMem, GetHbitmapOf(bmp));
+
+        // use MaskBlt() with ROP which doesn't do anything to dst in the mask
+        // points
+        bool ok = ::MaskBlt(GetHdc(), x, y, width, height,
+                            hdcMem, 0, 0,
+                            hbmpMask, 0, 0,
+                            MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
+        ::DeleteDC(hdcMem);
+
+        if ( !ok )
+#endif // Win32
+        {
+            // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
+            // level
+            wxMemoryDC memDC;
+            memDC.SelectObject(bmp);
+
+            Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+
+            memDC.SelectObject(wxNullBitmap);
+        }
+    }
+    else // no mask, just use BitBlt()

     {
         HDC cdc = GetHdc();
         HDC memdc = ::CreateCompatibleDC( cdc );
     {
         HDC cdc = GetHdc();
         HDC memdc = ::CreateCompatibleDC( cdc );


@@ -683,16 +727,6 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         ::SetTextColor(GetHdc(), old_textground);
         ::SetBkColor(GetHdc(), old_background);
     }
         ::SetTextColor(GetHdc(), old_textground);
         ::SetBkColor(GetHdc(), old_background);
     }

-    else
-    {
-        // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
-        wxMemoryDC memDC;
-        memDC.SelectObject(bmp);
-
-        Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
-
-        memDC.SelectObject(wxNullBitmap);
-    }

 }
 
 void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 }
 
 void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)


@@ -992,41 +1026,41 @@ void wxDC::SetLogicalFunction(int function)
 {
     m_logicalFunction = function;
 
 {
     m_logicalFunction = function;
 

-    SetRop((WXHDC) m_hDC);
+    SetRop(m_hDC);

 }
 
 void wxDC::SetRop(WXHDC dc)
 {
 }
 
 void wxDC::SetRop(WXHDC dc)
 {

-    if (!dc || m_logicalFunction < 0)
+    if ( !dc || m_logicalFunction < 0 )

         return;
 
         return;
 

-    int c_rop;
-    
+    int rop;
+

     switch (m_logicalFunction)
     {
     switch (m_logicalFunction)
     {

-           case wxXOR:          c_rop = R2_XORPEN;        break;
-           case wxINVERT:       c_rop = R2_NOT;           break;
-           case wxOR_REVERSE:   c_rop = R2_MERGEPENNOT;   break;
-           case wxAND_REVERSE:  c_rop = R2_MASKPENNOT;    break;
-           case wxCLEAR:        c_rop = R2_WHITE;         break;
-           case wxSET:          c_rop = R2_BLACK;         break;
-           case wxOR_INVERT:    c_rop = R2_MERGENOTPEN;   break;
-           case wxAND:          c_rop = R2_MASKPEN;       break;
-           case wxOR:           c_rop = R2_MERGEPEN;      break;
-           case wxEQUIV:        c_rop = R2_NOTXORPEN;     break;
-           case wxNAND:         c_rop = R2_NOTMASKPEN;    break;
-           case wxAND_INVERT:   c_rop = R2_MASKNOTPEN;    break;
-           case wxCOPY:         c_rop = R2_COPYPEN;       break;
-           case wxNO_OP:        c_rop = R2_NOP;           break;
-           case wxSRC_INVERT:   c_rop = R2_NOTCOPYPEN;    break;
-        case wxNOR:          c_rop = R2_NOTMERGEPEN;   break;
+        case wxCLEAR:        rop = R2_BLACK;         break;
+        case wxXOR:          rop = R2_XORPEN;        break;
+        case wxINVERT:       rop = R2_NOT;           break;
+        case wxOR_REVERSE:   rop = R2_MERGEPENNOT;   break;
+        case wxAND_REVERSE:  rop = R2_MASKPENNOT;    break;
+        case wxCOPY:         rop = R2_COPYPEN;       break;
+        case wxAND:          rop = R2_MASKPEN;       break;
+        case wxAND_INVERT:   rop = R2_MASKNOTPEN;    break;
+        case wxNO_OP:        rop = R2_NOP;           break;
+        case wxNOR:          rop = R2_NOTMERGEPEN;   break;
+        case wxEQUIV:        rop = R2_NOTXORPEN;     break;
+        case wxSRC_INVERT:   rop = R2_NOTCOPYPEN;    break;
+        case wxOR_INVERT:    rop = R2_MERGENOTPEN;   break;
+        case wxNAND:         rop = R2_NOTMASKPEN;    break;
+        case wxOR:           rop = R2_MERGEPEN;      break;
+        case wxSET:          rop = R2_WHITE;         break;
+

         default:
         default:

-        {

            wxFAIL_MSG( wxT("unsupported logical function") );
            wxFAIL_MSG( wxT("unsupported logical function") );

-           break;
-        }
+           return;

     }
     }

-    SetROP2((HDC) dc, c_rop);
+
+    SetROP2(GetHdc(), rop);

 }
 
 bool wxDC::StartDoc(const wxString& message)
 }
 
 bool wxDC::StartDoc(const wxString& message)


@@ -1278,51 +1312,40 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
     DWORD dwRop = SRCCOPY;
     switch (rop)
     {
     DWORD dwRop = SRCCOPY;
     switch (rop)
     {

-           case wxXOR:          dwRop = SRCINVERT;        break;
-           case wxINVERT:       dwRop = DSTINVERT;        break;
-           case wxOR_REVERSE:   dwRop = 0x00DD0228;       break;
-           case wxAND_REVERSE:  dwRop = SRCERASE;         break;
-           case wxCLEAR:        dwRop = BLACKNESS;        break;
-           case wxSET:          dwRop = WHITENESS;        break;
-           case wxOR_INVERT:    dwRop = MERGEPAINT;       break;
-           case wxAND:          dwRop = SRCAND;           break;
-           case wxOR:           dwRop = SRCPAINT;         break;
-           case wxEQUIV:        dwRop = 0x00990066;       break;
-           case wxNAND:         dwRop = 0x007700E6;       break;
-           case wxAND_INVERT:   dwRop = 0x00220326;       break;
-           case wxCOPY:         dwRop = SRCCOPY;          break;
-           case wxNO_OP:        dwRop = 0x00AA0029;       break;
-           case wxSRC_INVERT:   dwRop = NOTSRCCOPY;       break;
+        case wxXOR:          dwRop = SRCINVERT;        break;
+        case wxINVERT:       dwRop = DSTINVERT;        break;
+        case wxOR_REVERSE:   dwRop = 0x00DD0228;       break;
+        case wxAND_REVERSE:  dwRop = SRCERASE;         break;
+        case wxCLEAR:        dwRop = BLACKNESS;        break;
+        case wxSET:          dwRop = WHITENESS;        break;
+        case wxOR_INVERT:    dwRop = MERGEPAINT;       break;
+        case wxAND:          dwRop = SRCAND;           break;
+        case wxOR:           dwRop = SRCPAINT;         break;
+        case wxEQUIV:        dwRop = 0x00990066;       break;
+        case wxNAND:         dwRop = 0x007700E6;       break;
+        case wxAND_INVERT:   dwRop = 0x00220326;       break;
+        case wxCOPY:         dwRop = SRCCOPY;          break;
+        case wxNO_OP:        dwRop = DSTCOPY;          break;
+        case wxSRC_INVERT:   dwRop = NOTSRCCOPY;       break;

         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:
         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:

-        {

            wxFAIL_MSG( wxT("unsupported logical function") );
            wxFAIL_MSG( wxT("unsupported logical function") );

-           break;
-        }
+           return FALSE;

     }
 
     }
 

-

     bool success;
 
     if (useMask)
     {
 #ifdef __WIN32__
     bool success;
 
     if (useMask)
     {
 #ifdef __WIN32__

-        HBITMAP hbmpMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
-

         // we want the part of the image corresponding to the mask to be
         // we want the part of the image corresponding to the mask to be

-        // transparent, i.e. do PATCOPY there and apply dwRop elsewhere
-        const wxColour& colBg = m_backgroundBrush.GetColour();
-        HBRUSH hbrBg = (HBRUSH)::CreateSolidBrush(wxColourToRGB(colBg));
-        HBRUSH hbrOld = (HBRUSH)::SelectObject(GetHdc(), hbrBg);
-
+        // transparent, so use "DSTCOPY" ROP for the mask points (the usual
+        // meaning of fg and bg is inverted which corresponds to wxWin notion
+        // of the mask which is also contrary to the Windows one)

         success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
                             GetHdcOf(*source), xsrc, ysrc,
         success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
                             GetHdcOf(*source), xsrc, ysrc,

-                            hbmpMask, 0, 0,
-                            MAKEROP4(PATCOPY, dwRop)) != 0;
-
-        (void)::SelectObject(GetHdc(), hbrOld);
-        ::DeleteObject(hbrOld);
-        ::DeleteObject(hbmpMask);
+                            (HBITMAP)mask->GetMaskBitmap(), 0, 0,
+                            MAKEROP4(dwRop, DSTCOPY)) != 0;

 
         if ( !success )
 #endif // Win32
 
         if ( !success )
 #endif // Win32