X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44bcee116e0c56abe8027afcb1a3575fdc6ff732..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/generic/caret.cpp

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 6fb06d61a3..0f5aa7ac51 100644
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        generic/caret.cpp
+// Name:        src/generic/caret.cpp
 // Purpose:     generic wxCaret class implementation
 // Author:      Vadim Zeitlin (original code by Robert Roebling)
 // Modified by:
 // Created:     25.05.99
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -78,6 +77,19 @@ int wxCaretBase::GetBlinkTime()
 void wxCaretBase::SetBlinkTime(int milliseconds)
 {
     gs_blinkTime = milliseconds;
+
+#ifdef _WXGTK__
+    GtkSettings *settings = gtk_settings_get_default();
+    if (millseconds == 0)
+    {
+        gtk_settings_set_long_property(settings, "gtk-cursor-blink", gtk_false, NULL);
+    }
+    else
+    {
+        gtk_settings_set_long_property(settings, "gtk-cursor-blink", gtk_true, NULL);
+        gtk_settings_set_long_property(settings, "gtk-cursor-time", milliseconds, NULL);
+    }
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -243,16 +255,8 @@ void wxCaret::Refresh()
         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,
-                       &dcWin, x, y);
+                       &dcWin, m_x, m_y);
 
             m_xOld = m_x;
             m_yOld = m_y;