Merge recent changes from 2.8 branch.

Make updates for recent changes on CVS HEAD.
Remove or workaround deprecated items.
Fix compile errors.


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

wxPython/wx/lib/dialogs.py

@@ -34,8 +34,8 @@ class ScrolledMessageDialog(wx.Dialog):
         if x == -1 and y == -1:
             self.CenterOnScreen(wx.BOTH)
 
-        text = wx.TextCtrl(self, -1, msg, 
-                           style=wx.TE_MULTILINE | wx.TE_READONLY)
+        self.text = text = wx.TextCtrl(self, -1, msg, 
+                                       style=wx.TE_MULTILINE | wx.TE_READONLY)
 
         ok = wx.Button(self, wx.ID_OK, "OK")
         ok.SetDefault()