bitwise vs. logical operator

[wxWidgets.git] / wxPython / src / msw / richtext.py

diff --git a/wxPython/src/msw/richtext.py b/wxPython/src/msw/richtext.py
index fd57a8316dc5bce650f7f0e2741954b6f6a4a472..efe7f99d91ad63853043a2839d731817403cb60c 100644 (file)
--- a/wxPython/src/msw/richtext.py
+++ b/wxPython/src/msw/richtext.py
@@ -487,26 +487,6 @@ class RichTextAttr(object):
         """HasRightIndent(self) -> bool"""
         return _richtext.RichTextAttr_HasRightIndent(*args, **kwargs)
 
-    def HasWeight(*args, **kwargs):
-        """HasWeight(self) -> bool"""
-        return _richtext.RichTextAttr_HasWeight(*args, **kwargs)
-
-    def HasSize(*args, **kwargs):
-        """HasSize(self) -> bool"""
-        return _richtext.RichTextAttr_HasSize(*args, **kwargs)
-
-    def HasItalic(*args, **kwargs):
-        """HasItalic(self) -> bool"""
-        return _richtext.RichTextAttr_HasItalic(*args, **kwargs)
-
-    def HasUnderlined(*args, **kwargs):
-        """HasUnderlined(self) -> bool"""
-        return _richtext.RichTextAttr_HasUnderlined(*args, **kwargs)
-
-    def HasFaceName(*args, **kwargs):
-        """HasFaceName(self) -> bool"""
-        return _richtext.RichTextAttr_HasFaceName(*args, **kwargs)
-
     def HasFont(*args, **kwargs):
         """HasFont(self) -> bool"""
         return _richtext.RichTextAttr_HasFont(*args, **kwargs)
@@ -1416,7 +1396,7 @@ class RichTextCtrl(_windows.ScrolledWindow):
     InternalSelectionRange = property(GetInternalSelectionRange,SetInternalSelectionRange,doc="See `GetInternalSelectionRange` and `SetInternalSelectionRange`") 
     LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") 
     NumberOfLines = property(GetNumberOfLines,doc="See `GetNumberOfLines`") 
-    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
+    Selection = property(GetSelection,SetSelectionRange,doc="See `GetSelection` and `SetSelection`") 
     SelectionRange = property(GetSelectionRange,SetSelectionRange,doc="See `GetSelectionRange` and `SetSelectionRange`") 
     StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") 
     StyleSheet = property(GetStyleSheet,SetStyleSheet,doc="See `GetStyleSheet` and `SetStyleSheet`") 
@@ -1428,8 +1408,6 @@ def PreRichTextCtrl(*args, **kwargs):
     val = _richtext.new_PreRichTextCtrl(*args, **kwargs)
     return val
 
-wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED = _richtext.wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED
-wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED = _richtext.wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED
 wxEVT_COMMAND_RICHTEXT_LEFT_CLICK = _richtext.wxEVT_COMMAND_RICHTEXT_LEFT_CLICK
 wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK = _richtext.wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK
 wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK = _richtext.wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK
@@ -1439,8 +1417,8 @@ wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING = _richtext.wxEVT_COMMAND_RICHTEXT_ST
 wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED = _richtext.wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED
 wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING = _richtext.wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING
 wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED = _richtext.wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED
-EVT_RICHTEXT_ITEM_SELECTED = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED, 1)
-EVT_RICHTEXT_ITEM_DESELECTED = wx.PyEventBinder(wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED, 1)
+wxEVT_COMMAND_RICHTEXT_CHARACTER = _richtext.wxEVT_COMMAND_RICHTEXT_CHARACTER
+wxEVT_COMMAND_RICHTEXT_DELETE = _richtext.wxEVT_COMMAND_RICHTEXT_DELETE
 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)
@@ -1450,6 +1428,8 @@ EVT_RICHTEXT_STYLESHEET_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_RICHTEXT_STYL
 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)
 
 class RichTextEvent(_core.NotifyEvent):
     """Proxy of C++ RichTextEvent class"""
@@ -1458,13 +1438,13 @@ class RichTextEvent(_core.NotifyEvent):
     def __init__(self, *args, **kwargs): 
         """__init__(self, EventType commandType=wxEVT_NULL, int winid=0) -> RichTextEvent"""
         _richtext.RichTextEvent_swiginit(self,_richtext.new_RichTextEvent(*args, **kwargs))
-    def GetIndex(*args, **kwargs):
-        """GetIndex(self) -> int"""
-        return _richtext.RichTextEvent_GetIndex(*args, **kwargs)
+    def GetPosition(*args, **kwargs):
+        """GetPosition(self) -> int"""
+        return _richtext.RichTextEvent_GetPosition(*args, **kwargs)
 
-    def SetIndex(*args, **kwargs):
-        """SetIndex(self, int n)"""
-        return _richtext.RichTextEvent_SetIndex(*args, **kwargs)
+    def SetPosition(*args, **kwargs):
+        """SetPosition(self, int n)"""
+        return _richtext.RichTextEvent_SetPosition(*args, **kwargs)
 
     def GetFlags(*args, **kwargs):
         """GetFlags(self) -> int"""
@@ -1475,7 +1455,7 @@ class RichTextEvent(_core.NotifyEvent):
         return _richtext.RichTextEvent_SetFlags(*args, **kwargs)
 
     Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
-    Index = property(GetIndex,SetIndex,doc="See `GetIndex` and `SetIndex`") 
+    Index = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
 _richtext.RichTextEvent_swigregister(RichTextEvent)