X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdec7d7afd2d3ad32ba99a438cfe0eec5d339efa..302129f8967bd8589649a181160202783193890b:/wxPython/src/richtext.i?ds=sidebyside diff --git a/wxPython/src/richtext.i b/wxPython/src/richtext.i index 164657929e..87a22da1bd 100644 --- a/wxPython/src/richtext.i +++ b/wxPython/src/richtext.i @@ -81,10 +81,16 @@ enum { wxRICHTEXT_FORMATTED, wxRICHTEXT_UNFORMATTED, - + + wxRICHTEXT_SETSTYLE_NONE, + wxRICHTEXT_SETSTYLE_WITH_UNDO, + wxRICHTEXT_SETSTYLE_OPTIMIZE, + wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY, + wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY, + wxRICHTEXT_INSERT_NONE, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE, - + // TODO: Rename these to be wxRICHTEXT_* ?? @@ -109,7 +115,6 @@ enum { wxTEXT_ATTR_PARAGRAPH_STYLE_NAME, wxTEXT_ATTR_BULLET_STYLE, wxTEXT_ATTR_BULLET_NUMBER, - wxTEXT_ATTR_BULLET_SYMBOL, wxTEXT_ATTR_BULLET_STYLE_NONE, wxTEXT_ATTR_BULLET_STYLE_ARABIC, @@ -348,7 +353,7 @@ public: def SetFont(self, font): return self.GetFontAttributes(font) } - + // setters void SetTextColour(const wxColour& colText); void SetBackgroundColour(const wxColour& colBack); @@ -372,8 +377,9 @@ public: void SetLineSpacing(int spacing); void SetBulletStyle(int style); void SetBulletNumber(int n); - void SetBulletSymbol(wxChar symbol); - + void SetBulletText(wxChar symbol); + void SetBulletFont(const wxString& bulletFont); + const wxColour& GetTextColour() const; const wxColour& GetBackgroundColour() const; wxTextAttrAlignment GetAlignment() const; @@ -395,8 +401,9 @@ public: int GetParagraphSpacingBefore() const; int GetLineSpacing() const; int GetBulletStyle() const; - int GetBulletNumber() const { return m_bulletNumber; } - wxChar GetBulletSymbol() const; + int GetBulletNumber() const; + const wxString& GetBulletText() const; + const wxString& GetBulletFont() const; // accessors bool HasTextColour() const; @@ -405,11 +412,11 @@ public: bool HasTabs() const; bool HasLeftIndent() const; bool HasRightIndent() const; - bool HasWeight() const; - bool HasSize() const; - bool HasItalic() const; - bool HasUnderlined() const; - bool HasFaceName() const; +// bool HasWeight() const; +// bool HasSize() const; +// bool HasItalic() const; +// bool HasUnderlined() const; +// bool HasFaceName() const; bool HasFont() const; bool HasParagraphSpacingAfter() const; @@ -419,7 +426,7 @@ public: bool HasParagraphStyleName() const; bool HasBulletStyle() const; bool HasBulletNumber() const; - bool HasBulletSymbol() const; + bool HasBulletText() const; bool HasFlag(long flag) const; @@ -430,7 +437,7 @@ public: // returns false if we have any attributes set, true otherwise bool IsDefault() const; - + // // return the attribute having the valid font and colours: it uses the // // attributes set in attr and falls back first to attrDefault and then to // // the text control font/colours for those attributes which are not set @@ -438,12 +445,13 @@ public: // const wxRichTextAttr& attrDef, // const wxTextCtrlBase *text); - + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); + %property(BulletFont, GetBulletFont, SetBulletFont, doc="See `GetBulletFont` and `SetBulletFont`"); %property(BulletNumber, GetBulletNumber, SetBulletNumber, doc="See `GetBulletNumber` and `SetBulletNumber`"); %property(BulletStyle, GetBulletStyle, SetBulletStyle, doc="See `GetBulletStyle` and `SetBulletStyle`"); - %property(BulletSymbol, GetBulletSymbol, SetBulletSymbol, doc="See `GetBulletSymbol` and `SetBulletSymbol`"); + %property(BulletText, GetBulletText, SetBulletText, doc="See `GetBulletText` and `SetBulletText`"); %property(CharacterStyleName, GetCharacterStyleName, SetCharacterStyleName, doc="See `GetCharacterStyleName` and `SetCharacterStyleName`"); %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`"); @@ -607,6 +615,14 @@ during sizing.", ""); empty string is passed then to the filename set with `SetFilename`.", ""); + DocDeclStr( + void , SetHandlerFlags(int flags), + "Set the handler flags, controlling loading and saving.", ""); + + DocDeclStr( + int , GetHandlerFlags() const, + "Get the handler flags, controlling loading and saving.", ""); + // sets/clears the dirty flag DocDeclStr( virtual void , MarkDirty(), @@ -638,6 +654,15 @@ text control.", ""); virtual bool , SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style), "Set the style for the text in ``range`` to ``style``", ""); + DocDeclStr( + virtual bool , SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, + int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO), + "Extended style setting operation with flags including: +RICHTEXT_SETSTYLE_WITH_UNDO, RICHTEXT_SETSTYLE_OPTIMIZE, +RICHTEXT_SETSTYLE_PARAGRAPHS_ONLY, RICHTEXT_SETSTYLE_CHARACTERS_ONLY", ""); + + + DocDeclStr( virtual bool , GetStyle(long position, wxRichTextAttr& style), "Retrieve the style used at the given position. Copies the style @@ -649,8 +674,8 @@ if successful. Returns ``False`` otherwise.", ""); "Get the content (uncombined) attributes for this position. Copies the style values at ``position`` into the ``style`` parameter and returns ``True`` if successful. Returns ``False`` otherwise.", ""); - - + + DocDeclStr( virtual bool , SetDefaultStyle(const wxRichTextAttr& style), "Set the style used by default for the rich text document.", ""); @@ -1042,7 +1067,7 @@ flag.", ""); /// Begin symbol bullet DocDeclStr( - bool , BeginSymbolBullet(char symbol, + bool , BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL), @@ -1079,6 +1104,20 @@ flag.", ""); "", ""); + DocDeclStr( + bool , BeginListStyle(const wxString& listStyle, int level = 1, int number = 1), + "Begin named list style.", ""); + + DocDeclStr( + bool , EndListStyle(), "End named list style.", ""); + + DocDeclStr( + bool , BeginURL(const wxString& url, const wxString& characterStyle = wxEmptyString), + "Begin URL.", ""); + + DocDeclStr( + bool , EndURL(), "End URL.", ""); + /// Sets the default style to the style under the cursor DocDeclStr( bool , SetDefaultStyleToCursorStyle(), @@ -1094,7 +1133,7 @@ flag.", ""); DocDeclStr( virtual bool , SelectWord(long position), "", ""); - + /// Get/set the selection range in character positions. -1, -1 means no selection. DocDeclStr( @@ -1111,11 +1150,11 @@ flag.", ""); DocDeclStr( const wxRichTextRange& , GetInternalSelectionRange() const, "", ""); - + DocDeclStr( void , SetInternalSelectionRange(const wxRichTextRange& range), "", ""); - + /// Add a new paragraph of text to the end of the buffer @@ -1367,8 +1406,8 @@ flag.", ""); DocDeclStr( bool , ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL), "", ""); - - + + %property(Buffer, GetBuffer, doc="See `GetBuffer`"); %property(DefaultStyle, GetDefaultStyle, SetDefaultStyle, doc="See `GetDefaultStyle` and `SetDefaultStyle`"); @@ -1378,7 +1417,7 @@ flag.", ""); %property(InternalSelectionRange, GetInternalSelectionRange, SetInternalSelectionRange, doc="See `GetInternalSelectionRange` and `SetInternalSelectionRange`"); %property(LastPosition, GetLastPosition, doc="See `GetLastPosition`"); %property(NumberOfLines, GetNumberOfLines, doc="See `GetNumberOfLines`"); - %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(Selection, GetSelection, SetSelectionRange, doc="See `GetSelection` and `SetSelection`"); %property(SelectionRange, GetSelectionRange, SetSelectionRange, doc="See `GetSelectionRange` and `SetSelectionRange`"); %property(StringSelection, GetStringSelection, doc="See `GetStringSelection`"); %property(StyleSheet, GetStyleSheet, SetStyleSheet, doc="See `GetStyleSheet` and `SetStyleSheet`"); @@ -1486,23 +1525,30 @@ flag.", ""); //---------------------------------------------------------------------- -%constant wxEventType wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED; -%constant wxEventType wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED; %constant wxEventType wxEVT_COMMAND_RICHTEXT_LEFT_CLICK; %constant wxEventType wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK; %constant wxEventType wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK; %constant wxEventType wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK; %constant wxEventType wxEVT_COMMAND_RICHTEXT_RETURN; - +%constant wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING; +%constant wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED; +%constant wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING; +%constant wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED; +%constant wxEventType wxEVT_COMMAND_RICHTEXT_CHARACTER; +%constant wxEventType wxEVT_COMMAND_RICHTEXT_DELETE; %pythoncode { -EVT_RICHTEXT_ITEM_SELECTED = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED, 1) -EVT_RICHTEXT_ITEM_DESELECTED = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED, 1) EVT_RICHTEXT_LEFT_CLICK = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, 1) EVT_RICHTEXT_RIGHT_CLICK = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, 1) EVT_RICHTEXT_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, 1) EVT_RICHTEXT_LEFT_DCLICK = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, 1) EVT_RICHTEXT_RETURN = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_RETURN, 1) +EVT_RICHTEXT_STYLESHEET_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, 1) +EVT_RICHTEXT_STYLESHEET_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, 1) +EVT_RICHTEXT_STYLESHEET_REPLACING = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, 1) +EVT_RICHTEXT_STYLESHEET_REPLACED = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, 1) +EVT_RICHTEXT_CHARACTER = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_CHARACTER, 1) +EVT_RICHTEXT_DELETE = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_DELETE, 1) } @@ -1511,19 +1557,20 @@ class wxRichTextEvent : public wxNotifyEvent public: wxRichTextEvent(wxEventType commandType = wxEVT_NULL, int winid = 0); - int GetIndex() const; - void SetIndex(int n); + int GetPosition() const; + void SetPosition(int n); int GetFlags() const; void SetFlags(int flags); %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); - %property(Index, GetIndex, SetIndex, doc="See `GetIndex` and `SetIndex`"); + %property(Index, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); }; //---------------------------------------------------------------------- %init %{ + wxRichTextModuleInit(); %} //----------------------------------------------------------------------