Match some API tweaks made in CVS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i
index 95496984e53508d597ddb343bf6338cb89a3c9e0..f1298e1f57ccd64b00e59536ea66249956d99f35 100644 (file)
--- 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 ce3106b73432aa8f19830135c62f0ee7d78f3b1e..164657929ea8e0965367eace4322d8529e2c191e 100644 (file)
--- 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`");