Visualage C++ V4.0 duplicate symbol fixes

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

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 59a9112c2cb600852faf37e8114e294fe2be32d6..26206309411c4fb2ab32566c9bf0726e9bd34545 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -17,8 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if 0 //def __GNUG__
-    #pragma implementation "caret.h"
+#ifdef __GNUG__
+#pragma implementation "caret.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -29,7 +29,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/window.h"
+    #include "wx/dcclient.h"

 #endif //WX_PRECOMP
 
 #include "wx/caret.h"
 #endif //WX_PRECOMP
 
 #include "wx/caret.h"


@@ -45,6 +46,16 @@ static int gs_blinkTime = 500;  // in milliseconds
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+wxCaretTimer::wxCaretTimer(wxCaret *caret) 
+{ 
+    m_caret = caret; 
+}
+
+void wxCaretTimer::Notify() 
+{ 
+    m_caret->Blink(); 
+}
+

 // ----------------------------------------------------------------------------
 // wxCaret static functions and data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxCaret static functions and data
 // ----------------------------------------------------------------------------