SetIcon added

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 6a314bc94eee0cea858356e5da69087f2acca727..e88f6c96ca56a5d9dfc9d86a66e6b5c52225b677 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -19,10 +19,16 @@
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowBase;
 
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowBase;
 

-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// headers we have to include
+// ----------------------------------------------------------------------------
+
+#include "wx/gdicmn.h"  // for wxPoint, wxSize
+
+// ----------------------------------------------------------------------------

 // A caret is a blinking cursor showing the position where the typed text will
 // appear. It can be either a solid block or a custom bitmap (TODO)
 // A caret is a blinking cursor showing the position where the typed text will
 // appear. It can be either a solid block or a custom bitmap (TODO)

-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxCaretBase
 {
 
 class WXDLLEXPORT wxCaretBase
 {


@@ -63,6 +69,9 @@ public:
         // is the caret valid?
     bool IsOk() const { return m_width != 0 && m_height != 0; }
 
         // is the caret valid?
     bool IsOk() const { return m_width != 0 && m_height != 0; }
 

+        // is the caret currently shown?
+    bool IsVisible() const { return m_countVisible > 0; }
+

         // get the caret position
     void GetPosition(int *x, int *y) const
     {
         // get the caret position
     void GetPosition(int *x, int *y) const
     {


@@ -96,12 +105,12 @@ public:
         {
             if ( show )
             {
         {
             if ( show )
             {

-                if ( ++m_countVisible > 0 )
+                if ( m_countVisible++ == 0 )

                     DoShow();
             }
             else
             {
                     DoShow();
             }
             else
             {

-                if ( --m_countVisible < 1 )
+                if ( --m_countVisible == 0 )

                     DoHide();
             }
         }
                     DoHide();
             }
         }


@@ -167,11 +176,10 @@ private:
 // now include the real thing
 // ---------------------------------------------------------------------------
 
 // now include the real thing
 // ---------------------------------------------------------------------------
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     #include "wx/msw/caret.h"
 #else
     #include "wx/msw/caret.h"
 #else

-    // not implemented yet
-    typedef wxCaretBase wxCaret;
+    #include "wx/generic/caret.h"

 #endif // platform
 
 #endif // _WX_CARET_H_BASE_
 #endif // platform
 
 #endif // _WX_CARET_H_BASE_