X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4b8bf2fd1fab57c46063f5955fe24ba3ed2c23e..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/caret.h?ds=inline

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 07e06afeea..e65e9deca1 100644
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -1,27 +1,27 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        caret.h
+// Name:        wx/caret.h
 // Purpose:     wxCaretBase class - the interface of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 
-#ifdef __GNUG__
-#pragma interface "caret.h"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_CARET
 
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
 // ----------------------------------------------------------------------------
 // headers we have to include
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxWindowBase;
 // appear. It can be either a solid block or a custom bitmap (TODO)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCaretBase
+class WXDLLIMPEXP_CORE wxCaretBase
 {
 public:
     // ctors
@@ -57,6 +57,9 @@ public:
         (void)Create(window, size);
     }
 
+    // a virtual dtor has been provided since this class has virtual members
+    virtual ~wxCaretBase() { }
+
     // Create() functions - same as ctor but returns the success code
     // --------------------------------------------------------------
 
@@ -114,7 +117,7 @@ public:
         // show/hide the caret (should be called by wxWindow when needed):
         // Show() must be called as many times as Hide() + 1 to make the caret
         // visible
-    virtual void Show(bool show = TRUE)
+    virtual void Show(bool show = true)
         {
             if ( show )
             {
@@ -127,7 +130,7 @@ public:
                     DoHide();
             }
         }
-    virtual void Hide() { Show(FALSE); }
+    virtual void Hide() { Show(false); }
 
         // blink time is measured in milliseconds and is the time elapsed
         // between 2 inversions of the caret (blink time of the caret is common
@@ -152,7 +155,7 @@ protected:
         m_width = width;
         m_height = height;
 
-        return TRUE;
+        return true;
     }
 
     // pure virtuals to implement in the derived class
@@ -183,7 +186,7 @@ protected:
     int m_countVisible;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxCaretBase);
+    DECLARE_NO_COPY_CLASS(wxCaretBase)
 };
 
 // ---------------------------------------------------------------------------
@@ -202,25 +205,48 @@ private:
 // avoid overdrawing the caret
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCaretSuspend
+#ifdef wxHAS_CARET_USING_OVERLAYS
+
+// we don't need to hide the caret if it's rendered using overlays
+class WXDLLIMPEXP_CORE wxCaretSuspend
+{
+public:
+    wxCaretSuspend(wxWindow *WXUNUSED(win)) {}
+
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
+};
+
+#else // !wxHAS_CARET_USING_OVERLAYS
+
+class WXDLLIMPEXP_CORE wxCaretSuspend
 {
 public:
     wxCaretSuspend(wxWindow *win)
     {
         m_caret = win->GetCaret();
-        if ( m_caret )
+        m_show = false;
+        if ( m_caret && m_caret->IsVisible() )
+        {
             m_caret->Hide();
+            m_show = true;
+        }
     }
 
     ~wxCaretSuspend()
     {
-        if ( m_caret )
+        if ( m_caret && m_show )
             m_caret->Show();
     }
 
 private:
     wxCaret *m_caret;
+    bool     m_show;
+
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
 };
 
-#endif // _WX_CARET_H_BASE_
+#endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS
+
+#endif // wxUSE_CARET
 
+#endif // _WX_CARET_H_BASE_