replaced all int/size_t indices in wxControlWithItems API with unsigned int (committi...

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 5aceab1e706be8fd30e0329b673d1e29fd0e7b09..5b18d9dcc7cc29f3865bc1909c580ca8f7067eb1 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -6,7 +6,7 @@
 // Created:     23.05.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     23.05.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_BASE_


@@ -16,10 +16,6 @@
 
 #if wxUSE_CARET
 
 
 #if wxUSE_CARET
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "caret.h"
-#endif
-

 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------


@@ -61,6 +57,9 @@ public:
         (void)Create(window, size);
     }
 
         (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
     // --------------------------------------------------------------
 
     // Create() functions - same as ctor but returns the success code
     // --------------------------------------------------------------
 


@@ -118,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
         // 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 )
             {
         {
             if ( show )
             {


@@ -131,7 +130,7 @@ public:
                     DoHide();
             }
         }
                     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
 
         // blink time is measured in milliseconds and is the time elapsed
         // between 2 inversions of the caret (blink time of the caret is common


@@ -156,7 +155,7 @@ protected:
         m_width = width;
         m_height = height;
 
         m_width = width;
         m_height = height;
 

-        return TRUE;
+        return true;

     }
 
     // pure virtuals to implement in the derived class
     }
 
     // pure virtuals to implement in the derived class


@@ -212,11 +211,11 @@ public:
     wxCaretSuspend(wxWindow *win)
     {
         m_caret = win->GetCaret();
     wxCaretSuspend(wxWindow *win)
     {
         m_caret = win->GetCaret();

-        m_show = FALSE;        
+        m_show = false;

         if ( m_caret && m_caret->IsVisible() )
         {
             m_caret->Hide();
         if ( m_caret && m_caret->IsVisible() )
         {
             m_caret->Hide();

-            m_show = TRUE;
+            m_show = true;

         }
     }
 
         }
     }