Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Varous changes and tweaks to match some of Julian's new code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-09 02:38:10 +00:00
parent 3f3bf980f6
commit 1aefbabe46
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wxPython/src/richtext.i
View File

@@ -82,6 +82,12 @@ enum {
wxRICHTEXT_FORMATTED, wxRICHTEXT_FORMATTED,
wxRICHTEXT_UNFORMATTED, 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_NONE,
wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE,
@@ -373,6 +379,7 @@ public:
void SetBulletStyle(int style); void SetBulletStyle(int style);
void SetBulletNumber(int n); void SetBulletNumber(int n);
void SetBulletSymbol(wxChar symbol); void SetBulletSymbol(wxChar symbol);
void SetBulletFont(const wxString& bulletFont);
const wxColour& GetTextColour() const; const wxColour& GetTextColour() const;
const wxColour& GetBackgroundColour() const; const wxColour& GetBackgroundColour() const;
@@ -395,8 +402,9 @@ public:
int GetParagraphSpacingBefore() const; int GetParagraphSpacingBefore() const;
int GetLineSpacing() const; int GetLineSpacing() const;
int GetBulletStyle() const; int GetBulletStyle() const;
int GetBulletNumber() const { return m_bulletNumber; } int GetBulletNumber() const;
wxChar GetBulletSymbol() const; wxChar GetBulletSymbol() const;
const wxString& GetBulletFont() const;
// accessors // accessors
bool HasTextColour() const; bool HasTextColour() const;
@@ -441,6 +449,7 @@ public:
%property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`");
%property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); %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(BulletNumber, GetBulletNumber, SetBulletNumber, doc="See `GetBulletNumber` and `SetBulletNumber`");
%property(BulletStyle, GetBulletStyle, SetBulletStyle, doc="See `GetBulletStyle` and `SetBulletStyle`"); %property(BulletStyle, GetBulletStyle, SetBulletStyle, doc="See `GetBulletStyle` and `SetBulletStyle`");
%property(BulletSymbol, GetBulletSymbol, SetBulletSymbol, doc="See `GetBulletSymbol` and `SetBulletSymbol`"); %property(BulletSymbol, GetBulletSymbol, SetBulletSymbol, doc="See `GetBulletSymbol` and `SetBulletSymbol`");
@@ -638,6 +647,15 @@ text control.", "");
virtual bool , SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style), virtual bool , SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style),
"Set the style for the text in ``range`` to ``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( DocDeclStr(
virtual bool , GetStyle(long position, wxRichTextAttr& style), virtual bool , GetStyle(long position, wxRichTextAttr& style),
"Retrieve the style used at the given position. Copies the style "Retrieve the style used at the given position. Copies the style