reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
#define SWIGPYTHON
|
||||
#define SWIG_VERSION 0x010327
|
||||
|
||||
#ifdef __cplusplus
|
||||
template<class T> class SwigValueWrapper {
|
||||
@@ -1624,7 +1625,7 @@ SWIG_AsVal_long(PyObject* obj, long* val)
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
SWIG_type_error("number", obj);
|
||||
SWIG_Python_TypeError("number", obj);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1711,7 +1712,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
|
||||
{
|
||||
long v = 0;
|
||||
if (SWIG_AsVal_long(obj, &v) && v < 0) {
|
||||
SWIG_type_error("unsigned number", obj);
|
||||
SWIG_Python_TypeError("unsigned number", obj);
|
||||
}
|
||||
else if (val)
|
||||
*val = (unsigned long)v;
|
||||
@@ -1800,12 +1801,12 @@ SWIG_Check_unsigned_SS_long(PyObject* obj)
|
||||
}
|
||||
|
||||
|
||||
/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
#define SWIG_From_unsigned_SS_char PyInt_FromLong
|
||||
/*@@*/
|
||||
|
||||
|
||||
/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
#define SWIG_From_long PyInt_FromLong
|
||||
/*@@*/
|
||||
|
||||
@@ -1858,36 +1859,35 @@ SWIG_Check_int(PyObject* obj)
|
||||
}
|
||||
|
||||
|
||||
/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
#define SWIG_From_int PyInt_FromLong
|
||||
/*@@*/
|
||||
|
||||
|
||||
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
PyObject* o3;
|
||||
|
||||
if (!target) {
|
||||
target = o;
|
||||
} else if (target == Py_None) {
|
||||
Py_DECREF(Py_None);
|
||||
target = o;
|
||||
} else {
|
||||
if (!PyTuple_Check(target)) {
|
||||
o2 = target;
|
||||
target = PyTuple_New(1);
|
||||
PyTuple_SetItem(target, 0, o2);
|
||||
}
|
||||
o3 = PyTuple_New(1);
|
||||
PyTuple_SetItem(o3, 0, o);
|
||||
|
||||
o2 = target;
|
||||
target = PySequence_Concat(o2, o3);
|
||||
Py_DECREF(o2);
|
||||
Py_DECREF(o3);
|
||||
static PyObject* t_output_helper(PyObject* result, PyObject* obj)
|
||||
{
|
||||
PyObject* o2;
|
||||
PyObject* o3;
|
||||
if (!result) {
|
||||
result = obj;
|
||||
} else if (result == Py_None) {
|
||||
Py_DECREF(result);
|
||||
result = obj;
|
||||
} else {
|
||||
if (!PyTuple_Check(result)) {
|
||||
o2 = result;
|
||||
result = PyTuple_New(1);
|
||||
PyTuple_SET_ITEM(result, 0, o2);
|
||||
}
|
||||
o3 = PyTuple_New(1);
|
||||
PyTuple_SetItem(o3, 0, obj);
|
||||
o2 = result;
|
||||
result = PySequence_Concat(o2, o3);
|
||||
Py_DECREF(o2);
|
||||
Py_DECREF(o3);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
return target;
|
||||
}
|
||||
|
||||
|
||||
static PyObject *wxPen_GetDashes(wxPen *self){
|
||||
@@ -2193,7 +2193,7 @@ SWIG_AsVal_double(PyObject *obj, double* val)
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
SWIG_type_error("number", obj);
|
||||
SWIG_Python_TypeError("number", obj);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -2236,7 +2236,7 @@ static wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){
|
||||
return widths;
|
||||
}
|
||||
|
||||
/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
|
||||
#define SWIG_From_double PyFloat_FromDouble
|
||||
/*@@*/
|
||||
|
||||
@@ -19265,7 +19265,7 @@ static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwarg
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
{
|
||||
resultobj = wxPyMake_wxObject(result, 1);
|
||||
resultobj = wxPyMake_wxObject(result, (bool)1);
|
||||
}
|
||||
return resultobj;
|
||||
fail:
|
||||
|
Reference in New Issue
Block a user