updated version number

fixed a sample

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

diff --git a/wxPython/demo/wxChoice.py b/wxPython/demo/wxChoice.py
index da6fa7b2a0316f5572d6ba24dd66a5ee22a4f906..9cd83ce3b2877dd421273d2734dfaaa078e61991 100644 (file)
--- a/wxPython/demo/wxChoice.py
+++ b/wxPython/demo/wxChoice.py
@@ -15,8 +15,7 @@ class TestChoice(wxPanel):
                                wxPoint(15, 10))
 
         wxStaticText(self, -1, "Select one:", wxPoint(15, 50), wxSize(75, 20))
                                wxPoint(15, 10))
 
         wxStaticText(self, -1, "Select one:", wxPoint(15, 50), wxSize(75, 20))

-        self.ch = wxChoice(self, 40, (80, 50), (95, 125),
-                 choices = sampleList)
+        self.ch = wxChoice(self, 40, (80, 50), choices = sampleList)

         EVT_CHOICE(self, 40, self.EvtChoice)
 
 
         EVT_CHOICE(self, 40, self.EvtChoice)
 
 

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 9dfa2705b84216ae81e36696e41169488ef842b8..8a3f7ad185ee72cf5fb92521b465a1fa3efda2d2 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
 #----------------------------------------------------------------------
 
 # flags and values that affect this script
 #----------------------------------------------------------------------
 

-VERSION          = "2.3.1b1"
+VERSION          = "2.3.1"

 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "robin@alldunn.com"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "robin@alldunn.com"

diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
index ff5e7cef2c93b4a0160fc8101222011d8b3cceaf..7d36aeccae0a7a33727ea08959a08a278f95bef7 100644 (file)
--- a/wxPython/src/__version__.py
+++ b/wxPython/src/__version__.py
@@ -1 +1 @@
-ver = '2.3.1b1'
+ver = '2.3.1'