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 9d7864223be5c03081d103b78f47ff489199196a..b5b436808e16938a04ac61d5b6ed00a14a0b078d 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
-// 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) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "caret.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -53,14 +49,14 @@ static int gs_blinkTime = 500;  // in milliseconds
 // timer stuff
 // ----------------------------------------------------------------------------
 
-wxCaretTimer::wxCaretTimer(wxCaret *caret) 
-{ 
-    m_caret = caret; 
+wxCaretTimer::wxCaretTimer(wxCaret *caret)
+{
+    m_caret = caret;
 }
 
-void wxCaretTimer::Notify() 
-{ 
-    m_caret->OnTimer(); 
+void wxCaretTimer::Notify()
+{
+    m_caret->OnTimer();
 }
 
 void wxCaret::OnTimer()
@@ -82,6 +78,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
 }
 
 // ----------------------------------------------------------------------------
@@ -90,12 +99,13 @@ void wxCaretBase::SetBlinkTime(int milliseconds)
 
 void wxCaret::InitGeneric()
 {
-    m_hasFocus = TRUE;
-    m_blinkedOut = FALSE;
-
+    m_hasFocus = true;
+    m_blinkedOut = true;
+#ifndef wxHAS_CARET_USING_OVERLAYS
     m_xOld =
     m_yOld = -1;
     m_bmpUnderCaret.Create(m_width, m_height);
+#endif
 }
 
 wxCaret::~wxCaret()
@@ -118,8 +128,8 @@ void wxCaret::DoShow()
     if ( blinkTime )
         m_timer.Start(blinkTime);
 
-    m_blinkedOut = TRUE;
-    Blink();
+    if ( m_blinkedOut )
+        Blink();
 }
 
 void wxCaret::DoHide()
@@ -134,6 +144,9 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#endif
     if ( IsVisible() )
     {
         if ( !m_blinkedOut )
@@ -150,13 +163,34 @@ void wxCaret::DoMove()
     //else: will be shown at the correct location when it is shown
 }
 
+void wxCaret::DoSize()
+{
+    int countVisible = m_countVisible;
+    if (countVisible > 0)
+    {
+        m_countVisible = 0;
+        DoHide();
+    }
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#else
+    // Change bitmap size
+    m_bmpUnderCaret = wxBitmap(m_width, m_height);
+#endif
+    if (countVisible > 0)
+    {
+        m_countVisible = countVisible;
+        DoShow();
+    }
+}
+
 // ----------------------------------------------------------------------------
 // handling the focus
 // ----------------------------------------------------------------------------
 
 void wxCaret::OnSetFocus()
 {
-    m_hasFocus = TRUE;
+    m_hasFocus = true;
 
     if ( IsVisible() )
         Refresh();
@@ -164,7 +198,7 @@ void wxCaret::OnSetFocus()
 
 void wxCaret::OnKillFocus()
 {
-    m_hasFocus = FALSE;
+    m_hasFocus = false;
 
     if ( IsVisible() )
     {
@@ -195,6 +229,18 @@ void wxCaret::Blink()
 void wxCaret::Refresh()
 {
     wxClientDC dcWin(GetWindow());
+// this is the new code, switch to 0 if this gives problems
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height );
+    if ( m_blinkedOut )
+    {
+        dcOverlay.Clear();
+    }
+    else
+    {
+        DoDraw( &dcWin, GetWindow() );
+    }
+#else
     wxMemoryDC dcMem;
     dcMem.SelectObject(m_bmpUnderCaret);
     if ( m_blinkedOut )
@@ -210,16 +256,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;
@@ -228,16 +266,28 @@ void wxCaret::Refresh()
         //      more
 
         // and draw the caret there
-        DoDraw(&dcWin);
+        DoDraw(&dcWin, GetWindow());
     }
+#endif
 }
 
-void wxCaret::DoDraw(wxDC *dc)
+void wxCaret::DoDraw(wxDC *dc, wxWindow* win)
 {
-    dc->SetPen( *wxBLACK_PEN );
-
-    dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
-    dc->SetPen(*wxBLACK_PEN);
+    wxPen pen(*wxBLACK_PEN);
+    wxBrush brush(*wxBLACK_BRUSH);
+    if (win)
+    {
+        wxColour backgroundColour(win->GetBackgroundColour());
+        if (backgroundColour.Red() < 100 &&
+            backgroundColour.Green() < 100 &&
+            backgroundColour.Blue() < 100)
+        {
+            pen = *wxWHITE_PEN;
+            brush = *wxWHITE_BRUSH;
+        }
+    }
+    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