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

Match some API tweaks made in CVS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-02 20:04:42 +00:00
parent 70eb68e8bd
commit bdec7d7afd
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/src/_display.i
View File

@@ -100,7 +100,7 @@ class wxDisplay
{ {
public: public:
DocCtorStr( DocCtorStr(
wxDisplay(size_t index = 0), wxDisplay(unsigned index = 0),
"Set up a Display instance with the specified display. The displays "Set up a Display instance with the specified display. The displays
are numbered from 0 to GetCount() - 1, 0 is always the primary display are numbered from 0 to GetCount() - 1, 0 is always the primary display
and the only one which is always supported", ""); and the only one which is always supported", "");
@@ -108,7 +108,7 @@ and the only one which is always supported", "");
~wxDisplay(); ~wxDisplay();
DocDeclStr( DocDeclStr(
static size_t , GetCount(), static unsigned , GetCount(),
"Return the number of available displays.", ""); "Return the number of available displays.", "");
DocDeclStr( DocDeclStr(

25
wxPython/src/richtext.i
View File

@@ -81,6 +81,10 @@ enum {
wxRICHTEXT_FORMATTED, wxRICHTEXT_FORMATTED,
wxRICHTEXT_UNFORMATTED, wxRICHTEXT_UNFORMATTED,
wxRICHTEXT_INSERT_NONE,
wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE,
// TODO: Rename these to be wxRICHTEXT_* ?? // TODO: Rename these to be wxRICHTEXT_* ??
@@ -637,10 +641,16 @@ text control.", "");
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
values at ``position`` into the ``style`` parameter returns ``True`` values at ``position`` into the ``style`` parameter and returns ``True``
if successful. Returns ``False`` otherwise.", ""); if successful. Returns ``False`` otherwise.", "");
DocDeclStr(
virtual bool , GetUncombinedStyle(long position, wxRichTextAttr& style),
"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( DocDeclStr(
virtual bool , SetDefaultStyle(const wxRichTextAttr& style), virtual bool , SetDefaultStyle(const wxRichTextAttr& style),
"Set the style used by default for the rich text document.", ""); "Set the style used by default for the rich text document.", "");
@@ -1080,6 +1090,11 @@ flag.", "");
virtual void , SelectNone(), virtual void , SelectNone(),
"", ""); "", "");
/// Select the word at the given character position
DocDeclStr(
virtual bool , SelectWord(long position),
"", "");
/// Get/set the selection range in character positions. -1, -1 means no selection. /// Get/set the selection range in character positions. -1, -1 means no selection.
DocDeclStr( DocDeclStr(
@@ -1348,6 +1363,12 @@ flag.", "");
wxRichTextStyleSheet* , GetStyleSheet() const, wxRichTextStyleSheet* , GetStyleSheet() const,
"", ""); "", "");
/// Apply the style sheet to the buffer, for example if the styles have changed.
DocDeclStr(
bool , ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL),
"", "");
%property(Buffer, GetBuffer, doc="See `GetBuffer`"); %property(Buffer, GetBuffer, doc="See `GetBuffer`");
%property(DefaultStyle, GetDefaultStyle, SetDefaultStyle, doc="See `GetDefaultStyle` and `SetDefaultStyle`"); %property(DefaultStyle, GetDefaultStyle, SetDefaultStyle, doc="See `GetDefaultStyle` and `SetDefaultStyle`");