Some demo cleanup and distrib stuff

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

diff --git a/wxPython/MANIFEST.in b/wxPython/MANIFEST.in
index c9eb040343e3306757faa0fb45f158f4573c5954..7cf50a7c90fbeeaf59fb18b8f6677e4ce9bb26fe 100644 (file)
--- a/wxPython/MANIFEST.in
+++ b/wxPython/MANIFEST.in
@@ -33,6 +33,10 @@ include demo/data/*.py
 include demo/data/*.wav
 include demo/data/*.wdr
 include demo/data/*.xrc
+include demo/dllwidget/Makefile
+include demo/dllwidget/makefile.*
+include demo/dllwidget/*.cpp
+include demo/dllwidget/*.py
 
 include samples/doodle/*.txt
 include samples/doodle/*.py
@@ -166,6 +170,8 @@ include contrib/gizmos/*.c
 include contrib/gizmos/*.h
 include contrib/gizmos/contrib/include/wx/gizmos/*.h
 include contrib/gizmos/contrib/src/gizmos/*.cpp
+include contrib/gizmos/contrib/src/gizmos/*.xpm
+include contrib/gizmos/contrib/src/gizmos/*.txt
 
 include contrib/dllwidget/*.txt
 include contrib/dllwidget/*.i

diff --git a/wxPython/b b/wxPython/b
index ecad3115509bc0c57c5c716096037a44acbf974b..f8dff7e68122bc84afb69540492a90605282cf0a 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -57,18 +57,14 @@ elif [ "$1" = "s" ]; then
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then
     WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
-    for VER in 15 20 21; do
+    for VER in 21 22; do
        getpyver $VER
 
        echo "*****************************************************************"
        echo "*******      Building wxPython for Python $PYVER"
        echo "*****************************************************************"
 
-       # NOTE:  This assumes that /usr/local/bin is BEFORE /usr/bin on the PATH
-       #        AND that you have write access to it.
-       rm -f /usr/local/bin/python
-       ln -s /usr/bin/python$PYVER /usr/local/bin/python
-       SETUP="/usr/local/bin/python -u setup.py"
+       SETUP="python$PYVER -u setup.py"
 
        # save the original
        cp setup.py setup.py.save
@@ -78,13 +74,15 @@ elif [ "$1" = "r" ]; then
        sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py
 
        # build wxPython-gl RPM
-       $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt
+       $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt --python=python$PYVER
+                       ### --requires=python$PYVER
        rm dist/wxPython-gl*.tar.gz
 
        # Build wxPython RPM
        cp setup.py setup.py.temp
        sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py
-       $SETUP $OTHERFLAGS bdist_rpm --binary-only
+       $SETUP $OTHERFLAGS bdist_rpm --binary-only --python=python$PYVER
+                       ### --requires=python$PYVER
 
        # put the oringal setup.py back
        cp setup.py.save setup.py
@@ -95,8 +93,8 @@ elif [ "$1" = "r" ]; then
        mv dist/wxPython-gl-$WXPYVER-1.i386.rpm dist/wxPython-gl-$WXPYVER-1-Py$VER.i386.rpm
 
     done
+
     # rebuild the source dists without the munched up setup.py
-    $SETUP $OTHERFLAGS sdist
     $SETUP $OTHERFLAGS bdist_rpm --source-only
     exit 0
 

diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py
index ed3cc5e5fdcde6e0d79e64bad1cc7c7b2f76435d..a7abb1ab9ba3e830f7da6758265e2a2b8a7d1371 100644 (file)
--- a/wxPython/demo/SplitTree.py
+++ b/wxPython/demo/SplitTree.py
@@ -9,7 +9,6 @@ class TestTree(wxRemotelyScrolledTreeCtrl):
     def __init__(self, parent, ID, pos=wxDefaultPosition, size=wxDefaultSize,
                  style=wxTR_HAS_BUTTONS):
         wxRemotelyScrolledTreeCtrl.__init__(self, parent, ID, pos, size, style)
-        ##self.SetBackgroundColour("LIGHT BLUE")
 
         # make an image list
         im1 = im2 = -1
@@ -51,7 +50,7 @@ class TestValueWindow(wxTreeCompanionWindow):
             pen = wxPen(wxSystemSettings_GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID)
             dc.SetPen(pen)
             dc.SetBrush(wxBrush(self.GetBackgroundColour(), wxSOLID))
-            dc.DrawRectangle(rect.x, rect.y, rect.width+1, rect.height)
+            dc.DrawRectangle(rect.x, rect.y, rect.width+1, rect.height+1)
             dc.SetTextForeground("BLACK")
             dc.SetBackgroundMode(wxTRANSPARENT)
             tw, th = dc.GetTextExtent(text)
@@ -70,17 +69,19 @@ class TestPanel(wxPanel):
                                       style=wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL)
         splitter = wxThinSplitterWindow(scroller, -1, style=wxSP_3DBORDER | wxCLIP_CHILDREN)
         splitter.SetSashSize(2)
-        self.tree = TestTree(splitter, -1, style =
-                             wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_ROW_LINES | wxNO_BORDER )
+        tree = TestTree(splitter, -1, style = wxTR_HAS_BUTTONS |
+                                              wxTR_NO_LINES |
+                                              wxTR_ROW_LINES |
+                                              wxNO_BORDER )
         valueWindow = TestValueWindow(splitter, -1, style=wxNO_BORDER)
 
-        splitter.SplitVertically(self.tree, valueWindow)
+        splitter.SplitVertically(tree, valueWindow)
         splitter.SetSashPosition(150)
-        scroller.SetTargetWindow(self.tree)
+        scroller.SetTargetWindow(tree)
         scroller.EnableScrolling(FALSE, FALSE)
 
-        valueWindow.SetTreeCtrl(self.tree)
-        self.tree.SetCompanionWindow(valueWindow)
+        valueWindow.SetTreeCtrl(tree)
+        tree.SetCompanionWindow(valueWindow)
 
 
 

diff --git a/wxPython/demo/wxLEDNumberCtrl.py b/wxPython/demo/wxLEDNumberCtrl.py
index 1829e727130adddb28bf980fb2042907ba8a9872..22be241dbbb946ba8522a4a15483c9a055e294f7 100644 (file)
--- a/wxPython/demo/wxLEDNumberCtrl.py
+++ b/wxPython/demo/wxLEDNumberCtrl.py
@@ -12,11 +12,10 @@ class TestPanel(wxPanel):
         self.log = log
 
         led = wxLEDNumberCtrl(self, -1, (25,25), (280, 50))
-        led.SetValue("0123456789")
-        led.SetAlignment(wxLED_ALIGN_RIGHT)
+        led.SetValue("01234")
 
         led = wxLEDNumberCtrl(self, -1, (25,100), (280, 50))
-        led.SetValue("0123456789")
+        led.SetValue("56789")
         led.SetAlignment(wxLED_ALIGN_RIGHT)
         led.SetDrawFaded(false)
 

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 0332b10166b42ef1b8b00c3414815d8c2f5ad672..389d41a7fe65de1f7447629b60c2b48a5fcd10fb 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.2b7+"
+VERSION          = "2.3.2"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"