fixing warning and compile error against 10.4

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

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 96677b46d13a34e560567a22bc1390594c5f00cf..83fd6e1aae7c77d041a6e7a02e5fc5c5ea6a511d 100644 (file)
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -12,15 +12,17 @@
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "caret.h"
-#endif
-

 #include "wx/timer.h"
 #include "wx/timer.h"

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

 
 

-class 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);


@@ -30,7 +32,7 @@ private:
     wxCaret *m_caret;
 };
 
     wxCaret *m_caret;
 };
 

-class wxCaret : public wxCaretBase
+class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -68,17 +70,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