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
This commit is contained in:
@@ -2,7 +2,7 @@ CHANGES.txt for wxPython
|
|||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
2.3.4
|
2.3.4.1
|
||||||
-------
|
-------
|
||||||
Updated XRCed and wxTimeCtrl contribs.
|
Updated XRCed and wxTimeCtrl contribs.
|
||||||
|
|
||||||
|
@@ -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.4p2"
|
VERSION = "2.3.4.1"
|
||||||
DESCRIPTION = "Cross platform GUI toolkit for Python"
|
DESCRIPTION = "Cross platform GUI toolkit for Python"
|
||||||
AUTHOR = "Robin Dunn"
|
AUTHOR = "Robin Dunn"
|
||||||
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
|
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
|
||||||
|
@@ -1 +1 @@
|
|||||||
ver = '2.3.4p2'
|
ver = '2.3.4.1'
|
||||||
|
@@ -1503,11 +1503,13 @@ static PyObject *_wrap_wxSafeYield(PyObject *self, PyObject *args, PyObject *kwa
|
|||||||
PyObject * _resultobj;
|
PyObject * _resultobj;
|
||||||
bool _result;
|
bool _result;
|
||||||
wxWindow * _arg0 = (wxWindow *) NULL;
|
wxWindow * _arg0 = (wxWindow *) NULL;
|
||||||
|
bool _arg1 = (bool ) FALSE;
|
||||||
PyObject * _argo0 = 0;
|
PyObject * _argo0 = 0;
|
||||||
char *_kwnames[] = { "win", NULL };
|
int tempbool1 = (int) FALSE;
|
||||||
|
char *_kwnames[] = { "win","onlyIfNeeded", NULL };
|
||||||
|
|
||||||
self = self;
|
self = self;
|
||||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:wxSafeYield",_kwnames,&_argo0))
|
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|Oi:wxSafeYield",_kwnames,&_argo0,&tempbool1))
|
||||||
return NULL;
|
return NULL;
|
||||||
if (_argo0) {
|
if (_argo0) {
|
||||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||||
@@ -1516,9 +1518,10 @@ static PyObject *_wrap_wxSafeYield(PyObject *self, PyObject *args, PyObject *kwa
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
_arg1 = (bool ) tempbool1;
|
||||||
{
|
{
|
||||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||||
_result = (bool )wxSafeYield(_arg0);
|
_result = (bool )wxSafeYield(_arg0,_arg1);
|
||||||
|
|
||||||
wxPyEndAllowThreads(__tstate);
|
wxPyEndAllowThreads(__tstate);
|
||||||
if (PyErr_Occurred()) return NULL;
|
if (PyErr_Occurred()) return NULL;
|
||||||
|
@@ -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 wxPostEvent(wxEvtHandler *dest, wxEvent& event);
|
||||||
void wxWakeUpIdle();
|
void wxWakeUpIdle();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user