Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 3391ab910ea4070bc62d09cdd56452a685811717..8e7a8ec86b9d8ce499bb2732b64694f6dc835426 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:


@@ -88,7 +88,7 @@ void wxCaret::InitGeneric()
 {
     m_hasFocus = true;
     m_blinkedOut = true;
 {
     m_hasFocus = true;
     m_blinkedOut = true;

-#if !wxHAS_CARET_USING_OVERLAYS
+#ifndef wxHAS_CARET_USING_OVERLAYS

     m_xOld =
     m_yOld = -1;
     m_bmpUnderCaret.Create(m_width, m_height);
     m_xOld =
     m_yOld = -1;
     m_bmpUnderCaret.Create(m_width, m_height);


@@ -131,7 +131,7 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
 
 void wxCaret::DoMove()
 {

-#if wxHAS_CARET_USING_OVERLAYS
+#ifdef wxHAS_CARET_USING_OVERLAYS

     m_overlay.Reset();
 #endif
     if ( IsVisible() )
     m_overlay.Reset();
 #endif
     if ( IsVisible() )


@@ -158,7 +158,7 @@ void wxCaret::DoSize()
         m_countVisible = 0;
         DoHide();
     }
         m_countVisible = 0;
         DoHide();
     }

-#if wxHAS_CARET_USING_OVERLAYS
+#ifdef wxHAS_CARET_USING_OVERLAYS

     m_overlay.Reset();
 #else
     // Change bitmap size
     m_overlay.Reset();
 #else
     // Change bitmap size


@@ -217,7 +217,7 @@ void wxCaret::Refresh()
 {
     wxClientDC dcWin(GetWindow());
 // this is the new code, switch to 0 if this gives problems
 {
     wxClientDC dcWin(GetWindow());
 // this is the new code, switch to 0 if this gives problems

-#if wxHAS_CARET_USING_OVERLAYS
+#ifdef wxHAS_CARET_USING_OVERLAYS

     wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height );
     if ( m_blinkedOut )
     {
     wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height );
     if ( m_blinkedOut )
     {


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

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

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


@@ -243,16 +243,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,17 +253,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)

 {
 {

-    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
 
     // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
     //     done under wxGTK - no idea why