assert that name, not full path, is used in RenameEntry(); fixed RenameGroup() which...

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index a3edbb026b1dd9c33d4e692465930e7e31517825..08dd83006822b8f6fd3b5d479638afe4bab605d3 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -53,14 +53,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,8 +90,8 @@ void wxCaretBase::SetBlinkTime(int milliseconds)
 
 void wxCaret::InitGeneric()
 {
-    m_hasFocus = TRUE;
-    m_blinkedOut = TRUE;
+    m_hasFocus = true;
+    m_blinkedOut = true;
 
     m_xOld =
     m_yOld = -1;
@@ -150,13 +150,30 @@ 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();
+    }
+    // Change bitmap size
+    m_bmpUnderCaret = wxBitmap(m_width, m_height);
+    if (countVisible > 0)
+    {
+        m_countVisible = countVisible;
+        DoShow();
+    }
+}
+
 // ----------------------------------------------------------------------------
 // handling the focus
 // ----------------------------------------------------------------------------
 
 void wxCaret::OnSetFocus()
 {
-    m_hasFocus = TRUE;
+    m_hasFocus = true;
 
     if ( IsVisible() )
         Refresh();
@@ -164,7 +181,7 @@ void wxCaret::OnSetFocus()
 
 void wxCaret::OnKillFocus()
 {
-    m_hasFocus = FALSE;
+    m_hasFocus = false;
 
     if ( IsVisible() )
     {