Some Python 2.0 related fixes

Some little fixes and tweaks here and there
Some distrib stuff


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

wxPython/demo/About.py

@@ -13,8 +13,9 @@ class MyAboutBox(wxDialog):
 <center><table bgcolor="#458154" width="100%%" cellspacing="0"
 cellpadding="0" border="1">
 <tr>
-    <td align="center"><h1>wxPython %s</h1>
-    Running on Python %s
+    <td align="center">
+    <h1>wxPython %s</h1>
+    Running on Python %s<br>
     </td>
 </tr>
 </table>

wxPython/demo/XMLtreeview.py

@@ -1,9 +1,16 @@
 
-import string
+import string, sys
+
+py2 = sys.version[0] == '2'
 
 from wxPython.wx import *
 try:
-    from xml.parsers import pyexpat
+    if py2:
+        from xml.parsers import expat
+        parsermodule = expat
+    else:
+        from xml.parsers import pyexpat
+        parsermodule = pyexpat
     haveXML = true
 except ImportError:
     haveXML = false
@@ -12,7 +19,8 @@ except ImportError:
 
 if not haveXML:
     def runTest(frame, nb, log):
-        dlg = wxMessageDialog(frame, 'This demo requires the XML package.  See http://www.python.org/sigs/xml-sig/',
+        dlg = wxMessageDialog(frame, 'This demo requires the XML package.  '
+                              'See http://www.python.org/sigs/xml-sig/',
                           'Sorry', wxOK | wxICON_INFORMATION)
         dlg.ShowModal()
         dlg.Destroy()
@@ -26,6 +34,8 @@ else:
 
         # Define a handler for start element events
         def StartElement(self, name, attrs ):
+            if py2:
+                name = name.encode()
             id = self.AppendItem(self.nodeStack[-1], name)
             self.nodeStack.append(id)
 
@@ -34,12 +44,14 @@ else:
 
         def CharacterData(self, data ):
             if string.strip(data):
+                if py2:
+                    data = data.encode()
                 self.AppendItem(self.nodeStack[-1], data)
 
 
         def LoadTree(self, filename):
             # Create a parser
-            Parser = pyexpat.ParserCreate()
+            Parser = parsermodule.ParserCreate()
 
             # Tell the parser what the start element handler is
             Parser.StartElementHandler = self.StartElement

wxPython/demo/wxScrolledWindow.py

@@ -81,6 +81,9 @@ class MyCanvas(wxScrolledWindow):
         dc.DrawRectangle(50,500,50,50)
         dc.DrawRectangle(100,500,50,50)
 
+        dc.SetPen(pen1)
+        dc.DrawEllipticArc(200, 500, 50, 75, 0, 90)
+
         #from wxPython import dch
         #dch.FillRect(dc, wxRect(50, 400, 50, 50), wxBLACK)