diff --git a/wxPython/b b/wxPython/b index a8966dbf2c..c6ac5afd3f 100755 --- a/wxPython/b +++ b/wxPython/b @@ -1,32 +1,44 @@ #!/bin/sh +if [ "$1" = "15" ]; then + PYVER=1.5 + shift +elif [ "$1" = "20" ]; then + PYVER=2.0 + shift +fi + + SETUP="python$PYVER -u setup.py" FLAGS="USE_SWIG=1 IN_CVS_TREE=1" +OTHERFLAGS="" + + # "c" --> clean if [ "$1" = "c" ]; then shift - CMD="$SETUP $FLAGS clean" + CMD="$SETUP $FLAGS $OTHERFLAGS clean" OTHERCMD="rm -f wxPython/*.so" # "i" --> install elif [ "$1" = "i" ]; then shift - CMD="$SETUP build install" + CMD="$SETUP build $OTHERFLAGS install" # "s" --> source dist elif [ "$1" = "s" ]; then shift - CMD="$SETUP sdist" + CMD="$SETUP $OTHERFLAGS sdist" # "r" --> rpm dist elif [ "$1" = "r" ]; then shift - CMD="$SETUP bdist_rpm" + CMD="$SETUP $OTHERFLAGS bdist_rpm" # (no command arg) --> normal build for development else - CMD="$SETUP $FLAGS build_ext --inplace $*" + CMD="$SETUP $FLAGS $OTHERFLAGS build_ext --inplace $*" fi diff --git a/wxPython/demo/wxProcess.py b/wxPython/demo/wxProcess.py index 4ec789884c..4e25bd6e6d 100644 --- a/wxPython/demo/wxProcess.py +++ b/wxPython/demo/wxProcess.py @@ -62,6 +62,7 @@ class TestPanel(wxPanel): if self.process is not None: self.process.Detach() self.process.CloseOutput() + self.process = None def OnExecuteBtn(self, evt): @@ -85,6 +86,7 @@ class TestPanel(wxPanel): self.inp.SetValue('') self.log.write('OnSendText: "%s"\n' % text) self.process.GetOutputStream().write(text + '\n') + self.inp.SetFocus() def OnCloseStream(self, evt):