corrected a bug in dc which resetted the port , exchanged the wxchoice implementation

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 5a2926285a3119e6559f4513da58fb926169a8f8..07e06afeeab223735ba226e5d42c1595190b8050 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -96,7 +96,11 @@ public:
     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; }
+    void SetSize(int width, int height) {
+        m_width = width;
+        m_height = height;
+        DoSize();
+    }
     void SetSize(const wxSize& size) { SetSize(size.x, size.y); }
 
 
@@ -155,6 +159,7 @@ protected:
     virtual void DoShow() = 0;
     virtual void DoHide() = 0;
     virtual void DoMove() = 0;
+    virtual void DoSize() { }
 
     // the common initialization
     void Init()
@@ -191,5 +196,31 @@ 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;
+};
+
 #endif // _WX_CARET_H_BASE_