X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d59ceba5720b79347a1d63efe4497a768a819979..1fc8878582bcdab2a90b95fb713c4d088a0e2a57:/src/msw/dcmemory.cpp

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 78fa04fea3..cb5a8a8abc 100644
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -30,6 +30,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -40,9 +41,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 // ============================================================================
 // implementation
@@ -103,8 +102,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
     // check for whether the bitmap is already selected into a device context
     wxCHECK_RET( !bitmap.GetSelectedInto() ||
                  (bitmap.GetSelectedInto() == this),
-                 wxT("Bitmap is selected in another wxMemoryDC, delete the "
-                     "first wxMemoryDC or use SelectObject(NULL)") );
+                 wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
     m_selectedBitmap = bitmap;
     WXHBITMAP hBmp = m_selectedBitmap.GetHBITMAP();
@@ -116,7 +114,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 
     if ( !hBmp )
     {
-        wxLogLastError("SelectObject(memDC, bitmap)");
+        wxLogLastError(wxT("SelectObject(memDC, bitmap)"));
 
         wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC"));
     }
@@ -140,3 +138,59 @@ void wxMemoryDC::DoGetSize(int *width, int *height) const
     }
 }
 
+// the rest of this file deals with drawing rectangles workaround, disabled by
+// default
+
+#define wxUSE_MEMORY_DC_DRAW_RECTANGLE 0
+
+#if wxUSE_MEMORY_DC_DRAW_RECTANGLE
+
+// For some reason, drawing a rectangle on a memory DC has problems.
+// Use this substitute if we can.
+static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    wxBrush brush(dc.GetBrush());
+    wxPen pen(dc.GetPen());
+    if (brush.Ok() && brush.GetStyle() != wxTRANSPARENT)
+    {
+        HBRUSH hBrush = (HBRUSH) brush.GetResourceHandle() ;
+        if (hBrush)
+        {
+            RECT rect;
+            rect.left = x; rect.top = y;
+            rect.right = x + width - 1;
+            rect.bottom = y + height - 1;
+            ::FillRect((HDC) dc.GetHDC(), &rect, hBrush);
+        }
+    }
+    width --; height --;
+    if (pen.Ok() && pen.GetStyle() != wxTRANSPARENT)
+    {
+        dc.DrawLine(x, y, x + width, y);
+        dc.DrawLine(x, y, x, y + height);
+        dc.DrawLine(x, y+height, x+width, y + height);
+        dc.DrawLine(x+width, y+height, x+width, y);
+    }
+}
+
+#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
+
+void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    // Set this to 1 to work around an apparent video driver bug
+    // (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample)
+#if wxUSE_MEMORY_DC_DRAW_RECTANGLE
+    if (m_brush.Ok() && m_pen.Ok() &&
+        (m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) &&
+        (m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) &&
+        (GetLogicalFunction() == wxCOPY))
+    {
+        wxDrawRectangle(* this, x, y, width, height);
+    }
+    else
+#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
+    {
+        wxDC::DoDrawRectangle(x, y, width, height);
+    }
+}
+