diff --git a/wxPython/b b/wxPython/b index 8efbf89407..a8966dbf2c 100755 --- a/wxPython/b +++ b/wxPython/b @@ -1,3 +1,41 @@ #!/bin/sh -python -u setup.py USE_SWIG=1 IN_CVS_TREE=1 build_ext --inplace $* + +SETUP="python$PYVER -u setup.py" +FLAGS="USE_SWIG=1 IN_CVS_TREE=1" + +# "c" --> clean +if [ "$1" = "c" ]; then + shift + CMD="$SETUP $FLAGS clean" + OTHERCMD="rm -f wxPython/*.so" + +# "i" --> install +elif [ "$1" = "i" ]; then + shift + CMD="$SETUP build install" + +# "s" --> source dist +elif [ "$1" = "s" ]; then + shift + CMD="$SETUP sdist" + +# "r" --> rpm dist +elif [ "$1" = "r" ]; then + shift + CMD="$SETUP bdist_rpm" + +# (no command arg) --> normal build for development +else + CMD="$SETUP $FLAGS build_ext --inplace $*" +fi + + +echo $CMD +$CMD + + +if [ "$OTHERCMD" != "" ]; then + echo $OTHERCMD + $OTHERCMD +fi diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py index dff908655f..baf208298c 100644 --- a/wxPython/demo/About.py +++ b/wxPython/demo/About.py @@ -1,3 +1,4 @@ +import sys, string from wxPython.wx import * from wxPython.html import * @@ -12,7 +13,9 @@ class MyAboutBox(wxDialog):
- +

wxPython %s

wxPython %s

+ Running on Python %s +
@@ -42,9 +45,10 @@ demo item so you can learn how to use the classes yourself.

def __init__(self, parent): wxDialog.__init__(self, parent, -1, 'About the wxPython demo',) html = wxHtmlWindow(self, -1, size=(420, -1)) - html.SetPage(self.text % wx.__version__) + py_version = string.split(sys.version)[0] + html.SetPage(self.text % (wx.__version__, py_version)) ir = html.GetInternalRepresentation() - html.SetSize( (ir.GetWidth(), ir.GetHeight()) ) + html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) ) self.SetClientSize(html.GetSize()) self.CentreOnParent(wxBOTH)