Missed headers.

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 8110dea83ba619b64a827fdecb34dae04111172d..a3edbb026b1dd9c33d4e692465930e7e31517825 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,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "caret.h"
 #endif
 
@@ -91,7 +91,7 @@ void wxCaretBase::SetBlinkTime(int milliseconds)
 void wxCaret::InitGeneric()
 {
     m_hasFocus = TRUE;
-    m_blinkedOut = FALSE;
+    m_blinkedOut = TRUE;
 
     m_xOld =
     m_yOld = -1;
@@ -118,8 +118,8 @@ void wxCaret::DoShow()
     if ( blinkTime )
         m_timer.Start(blinkTime);
 
-    m_blinkedOut = TRUE;
-    Blink();
+    if ( m_blinkedOut )
+        Blink();
 }
 
 void wxCaret::DoHide()
@@ -158,7 +158,8 @@ void wxCaret::OnSetFocus()
 {
     m_hasFocus = TRUE;
 
-    Refresh();
+    if ( IsVisible() )
+        Refresh();
 }
 
 void wxCaret::OnKillFocus()