Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.

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

diff --git a/interface/wx/caret.h b/interface/wx/caret.h
index c967ee764a19775820df962fbd9a6a5f839697a9..b5d870635e7c97247ea0002da34c6fd2a3018af6 100644 (file)
--- a/interface/wx/caret.h
+++ b/interface/wx/caret.h
@@ -62,7 +62,7 @@ public:
         Get the caret position (in pixels).
     */
     void GetPosition(int* x, int* y) const;
         Get the caret position (in pixels).
     */
     void GetPosition(int* x, int* y) const;

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

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


@@ -70,7 +70,7 @@ public:
         Get the caret size.
     */
     void GetSize(int* width, int* height) const;
         Get the caret size.
     */
     void GetSize(int* width, int* height) const;

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

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


@@ -81,7 +81,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.


@@ -126,6 +126,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);

 };
 
 };