several mac fixes (Mark Newsams patches)

[wxWidgets.git] / src / generic / caret.cpp

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 444a59fea1dd206546f26397bc635283693a1439..8110dea83ba619b64a827fdecb34dae04111172d 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -209,8 +209,17 @@ void wxCaret::Refresh()
         if ( m_xOld == -1 && m_yOld == -1 )
         {
             // save the part we're going to overdraw
         if ( m_xOld == -1 && m_yOld == -1 )
         {
             // save the part we're going to overdraw

+
+            int x = m_x,
+                y = m_y;
+#if defined(__WXGTK__) && !defined(__WX_DC_BLIT_FIXED__)
+            wxPoint pt = dcWin.GetDeviceOrigin();
+            x += pt.x;
+            y += pt.y;
+#endif // broken wxGTK wxDC::Blit

             dcMem.Blit(0, 0, m_width, m_height,
             dcMem.Blit(0, 0, m_width, m_height,

-                       &dcWin, m_x, m_y);
+                       &dcWin, x, y);
+

             m_xOld = m_x;
             m_yOld = m_y;
         }
             m_xOld = m_x;
             m_yOld = m_y;
         }