Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a interpreter lock problem in the __eq__ and __ne__ methods in wxSize and etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-19 22:09:59 +00:00
parent bb722da782
commit 83609d6f72
5 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wxPython/src/helpers.cpp
View File

@@ -2224,7 +2224,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
*obj = ptr;
return TRUE;
}
// otherwise a string is expected
// otherwise check for a string
else if (PyString_Check(source) || PyUnicode_Check(source)) {
wxString spec = Py2wxString(source);
if (spec.GetChar(0) == '#' && spec.Length() == 7) { // It's #RRGGBB
@@ -2242,6 +2242,23 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
return TRUE;
}
}
// last chance: 3-tuple of integers is expected
else if (PySequence_Check(source) && PyObject_Length(source) == 3) {
PyObject* o1 = PySequence_GetItem(source, 0);
PyObject* o2 = PySequence_GetItem(source, 1);
PyObject* o3 = PySequence_GetItem(source, 2);
if (!PyNumber_Check(o1) || !PyNumber_Check(o2) || !PyNumber_Check(o3)) {
Py_DECREF(o1);
Py_DECREF(o2);
Py_DECREF(o3);
goto error;
}
**obj = wxColour(PyInt_AsLong(o1), PyInt_AsLong(o2), PyInt_AsLong(o3));
Py_DECREF(o1);
Py_DECREF(o2);
Py_DECREF(o3);
return TRUE;
}
error:
PyErr_SetString(PyExc_TypeError,