Patches, updates from contributors, etc.

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

wxPython/wxPython/lib/editor/editor.py

@@ -38,6 +38,19 @@ def ForceBetween(min, val, max):
         return min
     return val
 
+
+def LineTrimmer(lineOfText):
+    if len(lineOfText) == 0:
+        return ""
+    elif lineOfText[-1] == '\r':
+        return lineOfText[:-1]
+    else:
+        return lineOfText
+
+def LineSplitter(text):
+    return map (LineTrimmer, text.split('\n'))
+
+
 #----------------------------
 
 class Scroller:
@@ -685,7 +698,7 @@ class wxEditor(wxScrolledWindow):
         success = wxTheClipboard.GetData(do)
         wxTheClipboard.Close()
         if success:
-            pastedLines = string.split(do.GetText(), '\n')
+            pastedLines = LineSplitter(do.GetText())
         else:
             wxBell()
             return

wxPython/wxPython/lib/mvctree.py

@@ -731,7 +731,7 @@ class wxMVCTreeEvent(wxPyCommandEvent):
 
 class wxMVCTreeNotifyEvent(wxMVCTreeEvent):
     def __init__(self, type, id, node = None, nodes = None, **kwargs):
-        apply(wxMVCTreeEvent.__init__, (self, type, id), kwargs)
+        apply(wxMVCTreeEvent.__init__, (self, type, id, node, nodes), kwargs)
         self.notify = wxNotifyEvent(type, id)
     def getNotifyEvent(self):
         return self.notify