X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71185527a05c27931cd65359c1b23f0018b646ed..d0a341b34a6505ede0d26ea9c201da97f0fa9066:/include/wx/richtext/richtextctrl.h diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index be03f9c48d..3ca480b1a7 100644 --- 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 { - DECLARE_CLASS( wxRichTextCtrl ) + DECLARE_DYNAMIC_CLASS( wxRichTextCtrl ) 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(); /** - 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(); /** - 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(); /** - 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); /** - Apples bold to the selection (undoable). + Apples bold to the selection or default style (undoable). */ virtual bool ApplyBoldToSelection(); /** - Applies italic to the selection (undoable). + Applies italic to the selection or default style (undoable). */ virtual bool ApplyItalicToSelection(); /** - Applies underline to the selection (undoable). + Applies underline to the selection or default style (undoable). */ 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); @@ -2077,7 +2088,7 @@ private: Process a @c wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK event, generated when the user releases the middle mouse button over an object. @event{EVT_RICHTEXT_LEFT_DCLICK(id, func)} - Process a @c wxEVT_COMMAND_RICHTEXT_DLEFT_CLICK event, generated when the user + Process a @c wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK event, generated when the user double-clicks an object. @event{EVT_RICHTEXT_RETURN(id, func)} Process a @c wxEVT_COMMAND_RICHTEXT_RETURN event, generated when the user @@ -2311,6 +2322,7 @@ typedef void (wxEvtHandler::*wxRichTextEventFunction)(wxRichTextEvent&); #define EVT_RICHTEXT_STYLE_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ), #define EVT_RICHTEXT_SELECTION_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ), #define EVT_RICHTEXT_BUFFER_RESET(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, id, -1, wxRichTextEventHandler( fn ), NULL ), +#define EVT_RICHTEXT_FOCUS_OBJECT_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ), #endif // wxUSE_RICHTEXT