implemented menu drawing in the GTK theme

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 444a59fea1dd206546f26397bc635283693a1439..d199e5290f94b9f0efd3d9f5a39465fc410cb476 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -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()


@@ -209,8 +210,17 @@ void wxCaret::Refresh()
         if ( m_xOld == -1 && m_yOld == -1 )
         {
             // save the part we're going to overdraw
         if ( m_xOld == -1 && m_yOld == -1 )
         {
             // save the part we're going to overdraw

+
+            int x = m_x,
+                y = m_y;
+#if defined(__WXGTK__) && !defined(__WX_DC_BLIT_FIXED__)
+            wxPoint pt = dcWin.GetDeviceOrigin();
+            x += pt.x;
+            y += pt.y;
+#endif // broken wxGTK wxDC::Blit

             dcMem.Blit(0, 0, m_width, m_height,
             dcMem.Blit(0, 0, m_width, m_height,

-                       &dcWin, m_x, m_y);
+                       &dcWin, x, y);
+

             m_xOld = m_x;
             m_yOld = m_y;
         }
             m_xOld = m_x;
             m_yOld = m_y;
         }