Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

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

wxPython/demo/hangman.py

@@ -14,7 +14,7 @@ Have fun with it,
 
 Harm van der Heijden (H.v.d.Heijden@phys.tue.nl)"""
 
-import random,re,string
+import random,re
 from wxPython.wx import *
 
 
@@ -47,7 +47,7 @@ class WordFetcher:
             m = reg.search(self.words[index:])
             if m and len(m.groups()[0]) >= self.min_length: break
             n = n - 1
-        if n: return string.lower(m.groups()[0])
+        if n: return m.groups()[0].lower()
         return "error"
 
 
@@ -292,7 +292,7 @@ class MyFrame(wxFrame):
         menubar = wxMenuBar()
         menubar.Append(menu, "Game")
         menu = wxMenu()
-        #menu.Append(1010, "Internal", "Use internal dictionary", TRUE)
+        #menu.Append(1010, "Internal", "Use internal dictionary", True)
         menu.Append(1011, "ASCII File...")
         urls = [ 'wxPython home', 'http://wxPython.org/',
                  'slashdot.org', 'http://slashdot.org/',
@@ -349,7 +349,7 @@ class MyFrame(wxFrame):
 
     def OnGameDemo(self, event):
         frame = HangmanDemoFrame(self.wf, self, -1, wxDefaultPosition, self.GetSize())
-        frame.Show(TRUE)
+        frame.Show(True)
 
     def OnDictFile(self, event):
         fd = wxFileDialog(self)
@@ -433,8 +433,8 @@ class MyApp(wxApp):
         wf = WordFetcher(defaultfile)
         frame = MyFrame(None, wf)
         self.SetTopWindow(frame)
-        frame.Show(TRUE)
-        return TRUE
+        frame.Show(True)
+        return True
 
 
 
@@ -458,7 +458,7 @@ def runTest(frame, nb, log):
     wf = WordFetcher(defaultfile)
     win = MyFrame(frame, wf)
     frame.otherWin = win
-    win.Show(true)
+    win.Show(True)
 
 
 #----------------------------------------------------------------------