Merged the wxPy_newswig branch into the HEAD branch (main trunk)

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

wxPython/scripts/helpviewer

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-from wxPython.tools.helpviewer import main
+from wx.tools.helpviewer import main
 main()

wxPython/scripts/img2png

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
-from wxPython.tools.img2png import main
+from wx.tools.img2png import main
 main()
 

wxPython/scripts/img2py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 import sys
-from wxPython.tools.img2py import main
+from wx.tools.img2py import main
 main(sys.argv[1:])
 

wxPython/scripts/img2xpm

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
-from wxPython.tools.img2xpm import main
+from wx.tools.img2xpm import main
 main()
 

wxPython/scripts/xrced

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-from wxPython.tools.XRCed.xrced import main
+from wx.tools.XRCed.xrced import main
 main()