X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1aefbabe469074391a34b31e26a34bcfb41c00ae..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/src/richtext.i

diff --git a/wxPython/src/richtext.i b/wxPython/src/richtext.i
index 9ed5a8f4c8..87a22da1bd 100644
--- a/wxPython/src/richtext.i
+++ b/wxPython/src/richtext.i
@@ -115,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,
@@ -378,7 +377,7 @@ 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;
@@ -403,7 +402,7 @@ public:
     int GetLineSpacing() const;
     int GetBulletStyle() const;
     int GetBulletNumber() const;
-    wxChar GetBulletSymbol() const;
+    const wxString& GetBulletText() const;
     const wxString& GetBulletFont() const;
 
     // accessors
@@ -413,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;
@@ -427,7 +426,7 @@ public:
     bool HasParagraphStyleName() const;
     bool HasBulletStyle() const;
     bool HasBulletNumber() const;
-    bool HasBulletSymbol() const;
+    bool HasBulletText() const;
 
     bool HasFlag(long flag) const;
 
@@ -452,7 +451,7 @@ public:
     %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`");
@@ -616,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(),
@@ -1060,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),
@@ -1097,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(),
@@ -1396,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`");
@@ -1504,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)
 }
 
 
@@ -1529,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();
 %}
 
 //----------------------------------------------------------------------