#9591: Item state (icons) for wxTreeCtrl on any platform

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 8110dea83ba619b64a827fdecb34dae04111172d..5cad74d0864ac08890d6c7d84d5b72cd8d3b9760 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -5,7 +5,7 @@
 // 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()
@@ -90,12 +86,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 +115,8 @@ void wxCaret::DoShow()
     if ( blinkTime )
         m_timer.Start(blinkTime);
 
-    m_blinkedOut = TRUE;
-    Blink();
+    if ( m_blinkedOut )
+        Blink();
 }
 
 void wxCaret::DoHide()
@@ -134,6 +131,9 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#endif
     if ( IsVisible() )
     {
         if ( !m_blinkedOut )
@@ -150,20 +150,42 @@ 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;
 
-    Refresh();
+    if ( IsVisible() )
+        Refresh();
 }
 
 void wxCaret::OnKillFocus()
 {
-    m_hasFocus = FALSE;
+    m_hasFocus = false;
 
     if ( IsVisible() )
     {
@@ -194,6 +216,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 );
+    }
+#else
     wxMemoryDC dcMem;
     dcMem.SelectObject(m_bmpUnderCaret);
     if ( m_blinkedOut )
@@ -229,6 +263,7 @@ void wxCaret::Refresh()
         // and draw the caret there
         DoDraw(&dcWin);
     }
+#endif
 }
 
 void wxCaret::DoDraw(wxDC *dc)