Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index cf90f5985161a70d9840513f67cea46c3e86f849..b5b436808e16938a04ac61d5b6ed00a14a0b078d 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/caret.cpp
+// Name:        src/generic/caret.cpp

 // Purpose:     generic wxCaret class implementation
 // Author:      Vadim Zeitlin (original code by Robert Roebling)
 // Modified by:
 // Purpose:     generic wxCaret class implementation
 // Author:      Vadim Zeitlin (original code by Robert Roebling)
 // Modified by:


@@ -78,6 +78,19 @@ int wxCaretBase::GetBlinkTime()
 void wxCaretBase::SetBlinkTime(int milliseconds)
 {
     gs_blinkTime = milliseconds;
 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

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -225,7 +238,7 @@ void wxCaret::Refresh()
     }
     else
     {
     }
     else
     {

-        DoDraw( &dcWin );
+        DoDraw( &dcWin, GetWindow() );

     }
 #else
     wxMemoryDC dcMem;
     }
 #else
     wxMemoryDC dcMem;


@@ -243,16 +256,8 @@ 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, x, y);
+                       &dcWin, m_x, m_y);

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


@@ -261,44 +266,28 @@ void wxCaret::Refresh()
         //      more
 
         // and draw the caret there
         //      more
 
         // and draw the caret there

-        DoDraw(&dcWin);
+        DoDraw(&dcWin, GetWindow());

     }
 #endif
 }
 
     }
 #endif
 }
 

-void wxCaret::DoDraw(wxDC *dc)
+void wxCaret::DoDraw(wxDC *dc, wxWindow* win)

 {
 {

-#if defined(__WXGTK__) || defined(__WXMAC__)
-    wxClientDC* clientDC = wxDynamicCast(dc, wxClientDC);
-    if (clientDC)
+    wxPen pen(*wxBLACK_PEN);
+    wxBrush brush(*wxBLACK_BRUSH);
+    if (win)

     {
     {

-        wxPen pen(*wxBLACK_PEN);
-        wxBrush brush(*wxBLACK_BRUSH);
-#ifdef __WXGTK__
-        wxWindow* win = clientDC->m_owner;
-#else
-        wxWindow* win = clientDC->GetWindow();
-#endif
-        if (win)
+        wxColour backgroundColour(win->GetBackgroundColour());
+        if (backgroundColour.Red() < 100 &&
+            backgroundColour.Green() < 100 &&
+            backgroundColour.Blue() < 100)

         {
         {

-            wxColour backgroundColour(win->GetBackgroundColour());
-            if (backgroundColour.Red() < 100 &&
-                backgroundColour.Green() < 100 &&
-                backgroundColour.Blue() < 100)
-            {
-                pen = *wxWHITE_PEN;
-                brush = *wxWHITE_BRUSH;
-            }
+            pen = *wxWHITE_PEN;
+            brush = *wxWHITE_BRUSH;

         }
         }

-        dc->SetPen( pen );
-        dc->SetBrush(m_hasFocus ? brush : *wxTRANSPARENT_BRUSH);
-    }
-    else
-#endif
-    {
-        dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
-        dc->SetPen(*wxBLACK_PEN);

     }
     }

+    dc->SetPen( pen );
+    dc->SetBrush(m_hasFocus ? brush : *wxTRANSPARENT_BRUSH);

 
     // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
     //     done under wxGTK - no idea why
 
     // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
     //     done under wxGTK - no idea why