Use wxGetTranslation() instead of _() in the public headers.

[wxWidgets.git] / include / wx / generic / caret.h

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 644917c28ae0dccbd0d62c4c5a4f73ec4fcfa07d..67041cf20db8956f6418e58064fb6300b42a2b22 100644 (file)
--- 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
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -13,10 +12,16 @@
 #define _WX_CARET_H_
 
 #include "wx/timer.h"
 #define _WX_CARET_H_
 
 #include "wx/timer.h"

+#include "wx/dc.h"
+#include "wx/overlay.h"

 
 

-class WXDLLIMPEXP_CORE wxCaret;
+#ifdef wxHAS_NATIVE_OVERLAY
+    #define wxHAS_CARET_USING_OVERLAYS
+#endif

 
 

-class WXDLLEXPORT wxCaretTimer : public wxTimer
+class WXDLLIMPEXP_FWD_CORE wxCaret;
+
+class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer

 {
 public:
     wxCaretTimer(wxCaret *caret);
 {
 public:
     wxCaretTimer(wxCaret *caret);


@@ -64,17 +69,22 @@ protected:
     void Refresh();
 
     // draw the caret on the given DC
     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();
 
 
 private:
     // GTK specific initialization
     void InitGeneric();
 

+#ifdef wxHAS_CARET_USING_OVERLAYS
+    // the overlay for displaying the caret
+    wxOverlay   m_overlay;
+#else

     // the bitmap holding the part of window hidden by the caret when it was
     // at (m_xOld, m_yOld)
     wxBitmap      m_bmpUnderCaret;
     int           m_xOld,
                   m_yOld;
     // the bitmap holding the part of window hidden by the caret when it was
     // at (m_xOld, m_yOld)
     wxBitmap      m_bmpUnderCaret;
     int           m_xOld,
                   m_yOld;

+#endif

 
     wxCaretTimer  m_timer;
     bool          m_blinkedOut,     // true => caret hidden right now
 
     wxCaretTimer  m_timer;
     bool          m_blinkedOut,     // true => caret hidden right now