Merged wxPython 2.2.2 over to the main branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-10-30 21:08:42 +00:00
parent 7874bf5430
commit c368d904fc
193 changed files with 21992 additions and 4366 deletions
--- a/wxPython/wxPython/lib/editor/tokenizer.py
+++ b/wxPython/wxPython/lib/editor/tokenizer.py
@@ -31,7 +31,7 @@ class Tokenizer:
 	tname = tok_name[type]
   	if iskeyword(string):
    	    tname = "KEY"
-    	self.toks.append(tname, string, b, e)
+    	self.toks.append( (tname, string, b, e) )

    def readline(self):
    	t = self.text