X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfb76a19a4aeb25f245196ff5d4cae8a33fa6802..42bf837cea417f83f478709be322eb713e6e2ec8:/include/wx/caret.h?ds=sidebyside

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 9e0f3d3ea8..e34ed29d12 100644
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -12,7 +12,11 @@
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 
-#ifdef __GNUG__
+#include "wx/defs.h"
+
+#if wxUSE_CARET
+
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "caret.h"
 #endif
 
@@ -183,7 +187,7 @@ protected:
     int m_countVisible;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxCaretBase);
+    DECLARE_NO_COPY_CLASS(wxCaretBase)
 };
 
 // ---------------------------------------------------------------------------
@@ -196,5 +200,35 @@ private:
     #include "wx/generic/caret.h"
 #endif // platform
 
+// ----------------------------------------------------------------------------
+// wxCaretSuspend: a simple class which hides the caret in its ctor and
+// restores it in the dtor, this should be used when drawing on the screen to
+// avoid overdrawing the caret
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxCaretSuspend
+{
+public:
+    wxCaretSuspend(wxWindow *win)
+    {
+        m_caret = win->GetCaret();
+        if ( m_caret )
+            m_caret->Hide();
+    }
+
+    ~wxCaretSuspend()
+    {
+        if ( m_caret )
+            m_caret->Show();
+    }
+
+private:
+    wxCaret *m_caret;
+
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
+};
+
+#endif // wxUSE_CARET
+
 #endif // _WX_CARET_H_BASE_