More common code moved from generic dialogs to wxDialogBase::CreateButtonSizer()...

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 07e06afeeab223735ba226e5d42c1595190b8050..5b18d9dcc7cc29f3865bc1909c580ca8f7067eb1 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -5,16 +5,16 @@
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 

-#ifdef __GNUG__
-#pragma interface "caret.h"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_CARET

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


@@ -57,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
     // --------------------------------------------------------------
 


@@ -114,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 )
             {


@@ -127,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


@@ -152,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


@@ -183,7 +186,7 @@ protected:
     int m_countVisible;
 
 private:
     int m_countVisible;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxCaretBase);
+    DECLARE_NO_COPY_CLASS(wxCaretBase)

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


@@ -208,19 +211,28 @@ public:
     wxCaretSuspend(wxWindow *win)
     {
         m_caret = win->GetCaret();
     wxCaretSuspend(wxWindow *win)
     {
         m_caret = win->GetCaret();

-        if ( m_caret )
+        m_show = false;
+        if ( m_caret && m_caret->IsVisible() )
+        {

             m_caret->Hide();
             m_caret->Hide();

+            m_show = true;
+        }

     }
 
     ~wxCaretSuspend()
     {
     }
 
     ~wxCaretSuspend()
     {

-        if ( m_caret )
+        if ( m_caret && m_show )

             m_caret->Show();
     }
 
 private:
     wxCaret *m_caret;
             m_caret->Show();
     }
 
 private:
     wxCaret *m_caret;

+    bool     m_show;
+
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)

 };
 
 };
 

+#endif // wxUSE_CARET
+

 #endif // _WX_CARET_H_BASE_
 
 #endif // _WX_CARET_H_BASE_