fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 7ab4acc752690460bce07c227b5dfab03075f4f1..f7d91c76f86fdfa456817629ab320dcf637be124 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -12,6 +12,10 @@
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 

+#include "wx/defs.h"
+
+#if wxUSE_CARET
+

 #ifdef __GNUG__
 #pragma interface "caret.h"
 #endif
 #ifdef __GNUG__
 #pragma interface "caret.h"
 #endif


@@ -95,6 +99,15 @@ public:
         // get the window we're associated with
     wxWindow *GetWindow() const { return (wxWindow *)m_window; }
 
         // get the window we're associated with
     wxWindow *GetWindow() const { return (wxWindow *)m_window; }
 

+        // change the size of the caret
+    void SetSize(int width, int height) {
+        m_width = width;
+        m_height = height;
+        DoSize();
+    }
+    void SetSize(const wxSize& size) { SetSize(size.x, size.y); }
+
+

     // operations
     // ----------
 
     // operations
     // ----------
 


@@ -150,6 +163,7 @@ protected:
     virtual void DoShow() = 0;
     virtual void DoHide() = 0;
     virtual void DoMove() = 0;
     virtual void DoShow() = 0;
     virtual void DoHide() = 0;
     virtual void DoMove() = 0;

+    virtual void DoSize() { }

 
     // the common initialization
     void Init()
 
     // the common initialization
     void Init()


@@ -173,7 +187,7 @@ protected:
     int m_countVisible;
 
 private:
     int m_countVisible;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxCaretBase);
+    DECLARE_NO_COPY_CLASS(wxCaretBase)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -182,11 +196,37 @@ private:
 
 #if defined(__WXMSW__)
     #include "wx/msw/caret.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/caret.h"

-#elif  defined(__WXPM__)
-    #include "wx/os2/caret.h"

 #else
     #include "wx/generic/caret.h"
 #endif // platform
 
 #else
     #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;
+};
+
+#endif // wxUSE_CARET
+

 #endif // _WX_CARET_H_BASE_
 
 #endif // _WX_CARET_H_BASE_