X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30c841c84dce46690499567141b98ffcf5a61b6a..e91e1e3d5cab263883c1cee1689c898b8f7c4ecd:/include/wx/generic/caret.h?ds=sidebyside

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 8845f4cd8d..67041cf20d 100644
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        generic/caret.h
+// Name:        wx/generic/caret.h
 // Purpose:     generic wxCaret class
 // Author:      Vadim Zeitlin (original code by Robert Roebling)
 // Modified by:
 // Created:     25.05.99
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,13 +15,13 @@
 #include "wx/dc.h"
 #include "wx/overlay.h"
 
-#if wxHAS_NATIVE_OVERLAY
-    #define wxHAS_CARET_USING_OVERLAYS 1
+#ifdef wxHAS_NATIVE_OVERLAY
+    #define wxHAS_CARET_USING_OVERLAYS
 #endif
 
-class WXDLLIMPEXP_CORE wxCaret;
+class WXDLLIMPEXP_FWD_CORE wxCaret;
 
-class WXDLLEXPORT wxCaretTimer : public wxTimer
+class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer
 {
 public:
     wxCaretTimer(wxCaret *caret);
@@ -70,13 +69,13 @@ protected:
     void Refresh();
 
     // draw the caret on the given DC
-    void DoDraw(wxDC *dc);
+    void DoDraw(wxDC *dc, wxWindow* win);
 
 private:
     // GTK specific initialization
     void InitGeneric();
 
-#if wxHAS_CARET_USING_OVERLAYS
+#ifdef wxHAS_CARET_USING_OVERLAYS
     // the overlay for displaying the caret
     wxOverlay   m_overlay;
 #else