From 840eac6e39a54bb4d32ecf485f83ce28f3ee3dcc Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 17 Dec 2002 00:04:07 +0000 Subject: [PATCH] Updated version number, some other last minute tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/CHANGES.txt | 2 +- wxPython/setup.py | 2 +- wxPython/src/__version__.py | 2 +- wxPython/src/gtk/misc2.cpp | 9 ++++++--- wxPython/src/misc2.i | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/wxPython/CHANGES.txt b/wxPython/CHANGES.txt index ce78b04172..1d899fb02a 100644 --- a/wxPython/CHANGES.txt +++ b/wxPython/CHANGES.txt @@ -2,7 +2,7 @@ CHANGES.txt for wxPython ---------------------------------------------------------------------- -2.3.4 +2.3.4.1 ------- Updated XRCed and wxTimeCtrl contribs. diff --git a/wxPython/setup.py b/wxPython/setup.py index 3885f7be62..0bdf5bed99 100755 --- 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.4p2" +VERSION = "2.3.4.1" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py index a8791b442c..6a34fc4984 100644 --- a/wxPython/src/__version__.py +++ b/wxPython/src/__version__.py @@ -1 +1 @@ -ver = '2.3.4p2' +ver = '2.3.4.1' diff --git a/wxPython/src/gtk/misc2.cpp b/wxPython/src/gtk/misc2.cpp index cdf6489dde..598c30cc57 100644 --- a/wxPython/src/gtk/misc2.cpp +++ b/wxPython/src/gtk/misc2.cpp @@ -1503,11 +1503,13 @@ static PyObject *_wrap_wxSafeYield(PyObject *self, PyObject *args, PyObject *kwa PyObject * _resultobj; bool _result; wxWindow * _arg0 = (wxWindow *) NULL; + bool _arg1 = (bool ) FALSE; PyObject * _argo0 = 0; - char *_kwnames[] = { "win", NULL }; + int tempbool1 = (int) FALSE; + char *_kwnames[] = { "win","onlyIfNeeded", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:wxSafeYield",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|Oi:wxSafeYield",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1516,9 +1518,10 @@ static PyObject *_wrap_wxSafeYield(PyObject *self, PyObject *args, PyObject *kwa return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSafeYield(_arg0); + _result = (bool )wxSafeYield(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index 7137e58bc1..ebfb06a375 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -409,7 +409,7 @@ public: //---------------------------------------------------------------------- -bool wxSafeYield(wxWindow* win=NULL); +bool wxSafeYield(wxWindow* win=NULL, bool onlyIfNeeded=FALSE); void wxPostEvent(wxEvtHandler *dest, wxEvent& event); void wxWakeUpIdle();