converted to 16 colors

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 1c10856e42c97dd013de8f7894f7cd55f1b94811..7ab4acc752690460bce07c227b5dfab03075f4f1 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_
 
+#ifdef __GNUG__
+#pragma interface "caret.h"
+#endif
+
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
@@ -19,10 +23,16 @@
 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)
-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxCaretBase
 {
@@ -63,6 +73,9 @@ public:
         // 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
     {
@@ -167,11 +180,12 @@ private:
 // now include the real thing
 // ---------------------------------------------------------------------------
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
     #include "wx/msw/caret.h"
+#elif  defined(__WXPM__)
+    #include "wx/os2/caret.h"
 #else
-    // not implemented yet
-    typedef wxCaretBase wxCaret;
+    #include "wx/generic/caret.h"
 #endif // platform
 
 #endif // _WX_CARET_H_BASE_