minor fixes for custom controls support in wxFileDialog: slightly improve documentati...

[wxWidgets.git] / interface / wx / richtext / richtextctrl.h

diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h
index 11a5b60b08d2babdc0468adc5524f42cc1fb4771..d7f4147ef3c43a72beeba1a16a9b5df8b607f28f 100644 (file)
--- a/interface/wx/richtext/richtextctrl.h
+++ b/interface/wx/richtext/richtextctrl.h
@@ -159,6 +159,16 @@ public:
 
     For more information, see the @ref overview_richtextctrl.
 
 
     For more information, see the @ref overview_richtextctrl.
 

+    @beginStyleTable
+    @style{wxRE_CENTRE_CARET}
+           The control will try to keep the caret line centred vertically while editing.
+           wxRE_CENTER_CARET is a synonym for this style.
+    @style{wxRE_MULTILINE}
+           The control will be multiline (mandatory).
+    @style{wxRE_READONLY}
+           The control will not be editable.
+    @endStyleTable
+

     @library{wxrichtext}
     @category{richtext}
     @appearance{richtextctrl.png}
     @library{wxrichtext}
     @category{richtext}
     @appearance{richtextctrl.png}


@@ -452,7 +462,7 @@ public:
 
         @see SetListStyle(), PromoteList(), NumberList().
     */
 
         @see SetListStyle(), PromoteList(), NumberList().
     */

-    bool ClearListStyle(const wxRichTextRange& range,
+    virtual bool ClearListStyle(const wxRichTextRange& range,

                         int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
 
     /**
                         int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
 
     /**


@@ -1363,7 +1373,6 @@ public:
     bool SetStyle(long start, long end, const wxTextAttr& style);
     //@}
 
     bool SetStyle(long start, long end, const wxTextAttr& style);
     //@}
 

-    //@{

     /**
         Sets the attributes for the given range, passing flags to determine how the
         attributes are set.
     /**
         Sets the attributes for the given range, passing flags to determine how the
         attributes are set.


@@ -1391,13 +1400,9 @@ public:
         - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags
           are used in this operation.
     */
         - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags
           are used in this operation.
     */

-    bool SetStyleEx(const wxRichTextRange& range,
+    virtual bool SetStyleEx(const wxRichTextRange& range,

                     const wxTextAttr& style,
                     int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
                     const wxTextAttr& style,
                     int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);

-    bool SetStyleEx(long start, long end,
-                    const wxTextAttr& style,
-                    int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-    //@}

 
     /**
         Sets the style sheet associated with the control.
 
     /**
         Sets the style sheet associated with the control.