Minimal fixes so ipython-wx runs.
Minimal fixes so ipython-wx runs.

I've only done the most basic checks that it starts and simple things work,
this probably needs much more work in the future.

ipython/ipython,ipython/ipython