Switch all wxToolBarBase to wxToolBar

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
__str__ and __repr__ should return string objects, not bytes. Only encode on PY2.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Convert embedded image data from string literals to bytes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Fix import for Py3

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Some changes needed for the demo framework to start up and run with Py3.
Probably still needs some more work...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Update the six module to 1.5.2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Deprecate old method names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
- decode is done on read in py3
- phoenix DrawRectangle
sys.maxint —> six.MAXSIZE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Merge branch 'master' into myDemoNew

Conflicts:
	demo/Main.py