Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/interface/wx/caret.h b/interface/wx/caret.h
index c967ee764a19775820df962fbd9a6a5f839697a9..7b02f2c890dd473dc8a32f9a2542fb3b6b23356d 100644 (file)
--- a/interface/wx/caret.h
+++ b/interface/wx/caret.h
@@ -2,8 +2,7 @@
 // Name:        caret.h
 // Purpose:     interface of wxCaret
 // Author:      wxWidgets team
 // Name:        caret.h
 // Purpose:     interface of wxCaret
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -38,7 +37,7 @@ public:
         the @a window.
     */
     wxCaret(wxWindow* window, int width, int height);
         the @a window.
     */
     wxCaret(wxWindow* window, int width, int height);

-    wxCaret(wxWindowBase* window, const wxSize& size);
+    wxCaret(wxWindow* window, const wxSize& size);

     //@}
 
     //@{
     //@}
 
     //@{


@@ -46,8 +45,8 @@ public:
         Creates a caret with the given size (in pixels) and associates it with
         the @a window (same as the equivalent constructors).
     */
         Creates a caret with the given size (in pixels) and associates it with
         the @a window (same as the equivalent constructors).
     */

-    bool Create(wxWindowBase* window, int width, int height);
-    bool Create(wxWindowBase* window, const wxSize& size);
+    bool Create(wxWindow* window, int width, int height);
+    bool Create(wxWindow* window, const wxSize& size);

     //@}
 
     /**
     //@}
 
     /**


@@ -60,17 +59,31 @@ public:
     //@{
     /**
         Get the caret position (in pixels).
     //@{
     /**
         Get the caret position (in pixels).

+
+        @beginWxPerlOnly
+        In wxPerl there are two methods instead of a single overloaded
+        method:
+        - GetPosition(): returns a Wx::Point object.
+        - GetPositionXY(): returns a 2-element list (x, y).
+        @endWxPerlOnly

     */
     void GetPosition(int* x, int* y) const;
     */
     void GetPosition(int* x, int* y) const;

-    const wxPoint GetPosition() const;
+    wxPoint GetPosition() const;

     //@}
 
     //@{
     /**
         Get the caret size.
     //@}
 
     //@{
     /**
         Get the caret size.

+
+        @beginWxPerlOnly
+        In wxPerl there are two methods instead of a single overloaded
+        method:
+        - GetSize(): returns a Wx::Size object.
+        - GetSizeWH(): returns a 2-element list (width, height).
+        @endWxPerlOnly

     */
     void GetSize(int* width, int* height) const;
     */
     void GetSize(int* width, int* height) const;

-    const wxSize  GetSize() const;
+    wxSize GetSize() const;

     //@}
 
     /**
     //@}
 
     /**


@@ -81,7 +94,7 @@ public:
     /**
         Hides the caret, same as Show(@false).
     */
     /**
         Hides the caret, same as Show(@false).
     */

-    void Hide();
+    virtual void Hide();

 
     /**
         Returns @true if the caret was created successfully.
 
     /**
         Returns @true if the caret was created successfully.


@@ -90,7 +103,7 @@ public:
 
     /**
         Returns @true if the caret is visible and @false if it is permanently
 
     /**
         Returns @true if the caret is visible and @false if it is permanently

-        hidden (if it is is blinking and not shown currently but will be after
+        hidden (if it is blinking and not shown currently but will be after

         the next blink, this method still returns @true).
     */
     bool IsVisible() const;
         the next blink, this method still returns @true).
     */
     bool IsVisible() const;


@@ -126,6 +139,6 @@ public:
         Shows or hides the caret. Notice that if the caret was hidden N times,
         it must be shown N times as well to reappear on the screen.
     */
         Shows or hides the caret. Notice that if the caret was hidden N times,
         it must be shown N times as well to reappear on the screen.
     */

-    void Show(bool show = true);
+    virtual void Show(bool show = true);

 };
 
 };