extending calculation of visible region

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 8110dea83ba619b64a827fdecb34dae04111172d..e2039646c52e70303cb011fc3ed0d6fcc723d350 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "caret.h"
 #endif
 
     #pragma implementation "caret.h"
 #endif
 


@@ -91,7 +91,7 @@ void wxCaretBase::SetBlinkTime(int milliseconds)
 void wxCaret::InitGeneric()
 {
     m_hasFocus = TRUE;
 void wxCaret::InitGeneric()
 {
     m_hasFocus = TRUE;

-    m_blinkedOut = FALSE;
+    m_blinkedOut = TRUE;

 
     m_xOld =
     m_yOld = -1;
 
     m_xOld =
     m_yOld = -1;


@@ -118,8 +118,8 @@ void wxCaret::DoShow()
     if ( blinkTime )
         m_timer.Start(blinkTime);
 
     if ( blinkTime )
         m_timer.Start(blinkTime);
 

-    m_blinkedOut = TRUE;
-    Blink();
+    if ( m_blinkedOut )
+        Blink();

 }
 
 void wxCaret::DoHide()
 }
 
 void wxCaret::DoHide()


@@ -158,7 +158,8 @@ void wxCaret::OnSetFocus()
 {
     m_hasFocus = TRUE;
 
 {
     m_hasFocus = TRUE;
 

-    Refresh();
+    if ( IsVisible() )
+        Refresh();

 }
 
 void wxCaret::OnKillFocus()
 }
 
 void wxCaret::OnKillFocus()