Don't force ColWidth to always grow for wxGridCellAutoWrapStringRenderer (#1798)

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index d199e5290f94b9f0efd3d9f5a39465fc410cb476..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$
 // Modified by:
 // Created:     25.05.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "caret.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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
 // ----------------------------------------------------------------------------
 
 // 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()
 }
 
 void wxCaret::OnTimer()


@@ -90,12 +86,13 @@ void wxCaretBase::SetBlinkTime(int milliseconds)
 
 void wxCaret::InitGeneric()
 {
 
 void wxCaret::InitGeneric()
 {

-    m_hasFocus = TRUE;
-    m_blinkedOut = TRUE;
-
+    m_hasFocus = true;
+    m_blinkedOut = true;
+#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);

+#endif

 }
 
 wxCaret::~wxCaret()
 }
 
 wxCaret::~wxCaret()


@@ -134,6 +131,9 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
 
 void wxCaret::DoMove()
 {

+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#endif

     if ( IsVisible() )
     {
         if ( !m_blinkedOut )
     if ( IsVisible() )
     {
         if ( !m_blinkedOut )


@@ -150,13 +150,34 @@ void wxCaret::DoMove()
     //else: will be shown at the correct location when it is shown
 }
 
     //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()
 {
 // ----------------------------------------------------------------------------
 // handling the focus
 // ----------------------------------------------------------------------------
 
 void wxCaret::OnSetFocus()
 {

-    m_hasFocus = TRUE;
+    m_hasFocus = true;

 
     if ( IsVisible() )
         Refresh();
 
     if ( IsVisible() )
         Refresh();


@@ -164,7 +185,7 @@ void wxCaret::OnSetFocus()
 
 void wxCaret::OnKillFocus()
 {
 
 void wxCaret::OnKillFocus()
 {

-    m_hasFocus = FALSE;
+    m_hasFocus = false;

 
     if ( IsVisible() )
     {
 
     if ( IsVisible() )
     {


@@ -195,6 +216,18 @@ void wxCaret::Blink()
 void wxCaret::Refresh()
 {
     wxClientDC dcWin(GetWindow());
 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 )
     wxMemoryDC dcMem;
     dcMem.SelectObject(m_bmpUnderCaret);
     if ( m_blinkedOut )


@@ -230,6 +263,7 @@ void wxCaret::Refresh()
         // and draw the caret there
         DoDraw(&dcWin);
     }
         // and draw the caret there
         DoDraw(&dcWin);
     }

+#endif

 }
 
 void wxCaret::DoDraw(wxDC *dc)
 }
 
 void wxCaret::DoDraw(wxDC *dc)