Include wx/defs.h, not wx/setup.h from wx/webview.h for consistency.

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

diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index be03f9c48d581ab5e0497b62737224a040bdb717..d441b2b5d71bc0ff31e3d95f6ad5298a7d83f90a 100644 (file)
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -212,7 +212,7 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl,
                                             public wxTextCtrlIface,
                                             public wxScrollHelper
 {
                                             public wxTextCtrlIface,
                                             public wxScrollHelper
 {

-    DECLARE_CLASS( wxRichTextCtrl )
+    DECLARE_DYNAMIC_CLASS( wxRichTextCtrl )

     DECLARE_EVENT_TABLE()
 
 public:
     DECLARE_EVENT_TABLE()
 
 public:


@@ -1476,42 +1476,53 @@ public:
     }
 
     /**
     }
 
     /**

-        Returns @true if all of the selection is bold.
+        Returns @true if all of the selection, or the content at the caret position, is bold.

     */
     virtual bool IsSelectionBold();
 
     /**
     */
     virtual bool IsSelectionBold();
 
     /**

-        Returns @true if all of the selection is italic.
+        Returns @true if all of the selection, or the content at the caret position, is italic.

     */
     virtual bool IsSelectionItalics();
 
     /**
     */
     virtual bool IsSelectionItalics();
 
     /**

-        Returns @true if all of the selection is underlined.
+        Returns @true if all of the selection, or the content at the caret position, is underlined.

     */
     virtual bool IsSelectionUnderlined();
 
     /**
     */
     virtual bool IsSelectionUnderlined();
 
     /**

-        Returns @true if all of the selection is aligned according to the specified flag.
+        Returns @true if all of the selection, or the content at the current caret position, has the supplied wxTextAttrEffects flag(s).
+    */
+    virtual bool DoesSelectionHaveTextEffectFlag(int flag);
+
+    /**
+        Returns @true if all of the selection, or the content at the caret position, is aligned according to the specified flag.

     */
     virtual bool IsSelectionAligned(wxTextAttrAlignment alignment);
 
     /**
     */
     virtual bool IsSelectionAligned(wxTextAttrAlignment alignment);
 
     /**

-        Apples bold to the selection (undoable).
+        Apples bold to the selection or default style (undoable).

     */
     virtual bool ApplyBoldToSelection();
 
     /**
     */
     virtual bool ApplyBoldToSelection();
 
     /**

-        Applies italic to the selection (undoable).
+        Applies italic to the selection or default style (undoable).

     */
     virtual bool ApplyItalicToSelection();
 
     /**
     */
     virtual bool ApplyItalicToSelection();
 
     /**

-        Applies underline to the selection (undoable).
+        Applies underline to the selection or default style (undoable).

     */
     virtual bool ApplyUnderlineToSelection();
 
     /**
     */
     virtual bool ApplyUnderlineToSelection();
 
     /**

-        Applies the given alignment to the selection (undoable).
+        Applies one or more wxTextAttrEffects flags to the selection (undoable).
+        If there is no selection, it is applied to the default style.
+    */
+    virtual bool ApplyTextEffectToSelection(int flags);
+
+    /**
+        Applies the given alignment to the selection or the default style (undoable).

         For alignment values, see wxTextAttr.
     */
     virtual bool ApplyAlignmentToSelection(wxTextAttrAlignment alignment);
         For alignment values, see wxTextAttr.
     */
     virtual bool ApplyAlignmentToSelection(wxTextAttrAlignment alignment);