From bdec7d7afd2d3ad32ba99a438cfe0eec5d339efa Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 2 Oct 2006 20:04:42 +0000
Subject: [PATCH] Match some API tweaks made in CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
wxPython/src/_display.i | 4 ++--
wxPython/src/richtext.i | 25 +++++++++++++++++++++++--
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i
index 95496984e5..f1298e1f57 100644
--- a/wxPython/src/_display.i
+++ b/wxPython/src/_display.i
@@ -100,7 +100,7 @@ class wxDisplay
{
public:
DocCtorStr(
- wxDisplay(size_t index = 0),
+ wxDisplay(unsigned index = 0),
"Set up a Display instance with the specified display. The displays
are numbered from 0 to GetCount() - 1, 0 is always the primary display
and the only one which is always supported", "");
@@ -108,7 +108,7 @@ and the only one which is always supported", "");
~wxDisplay();
DocDeclStr(
- static size_t , GetCount(),
+ static unsigned , GetCount(),
"Return the number of available displays.", "");
DocDeclStr(
diff --git a/wxPython/src/richtext.i b/wxPython/src/richtext.i
index ce3106b734..164657929e 100644
--- a/wxPython/src/richtext.i
+++ b/wxPython/src/richtext.i
@@ -81,6 +81,10 @@ enum {
wxRICHTEXT_FORMATTED,
wxRICHTEXT_UNFORMATTED,
+
+ wxRICHTEXT_INSERT_NONE,
+ wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE,
+
// TODO: Rename these to be wxRICHTEXT_* ??
@@ -637,10 +641,16 @@ text control.", "");
DocDeclStr(
virtual bool , GetStyle(long position, wxRichTextAttr& 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.", "");
-
+ 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(
virtual bool , SetDefaultStyle(const wxRichTextAttr& style),
"Set the style used by default for the rich text document.", "");
@@ -1080,6 +1090,11 @@ flag.", "");
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.
DocDeclStr(
@@ -1348,6 +1363,12 @@ flag.", "");
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(DefaultStyle, GetDefaultStyle, SetDefaultStyle, doc="See `GetDefaultStyle` and `SetDefaultStyle`");
--
2.47.2