projects
/
wxWidgets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d74c6a9
)
Clear possible exception from failed wxPyConvertSwigPtr
author
Robin Dunn
<robin@alldunn.com>
Mon, 23 Jan 2006 20:06:39 +0000
(20:06 +0000)
committer
Robin Dunn
<robin@alldunn.com>
Mon, 23 Jan 2006 20:06:39 +0000
(20:06 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37089
c3d73ce0
-8a6f-49c7-b76d-
6d57e0e08775
wxPython/include/wx/wxPython/wxPython_int.h
patch
|
blob
|
blame
|
history
diff --git
a/wxPython/include/wx/wxPython/wxPython_int.h
b/wxPython/include/wx/wxPython/wxPython_int.h
index 334fdcd323c9c495742e5bf5473fb05f5a6f53f5..cca6beddb2e57f46c92d468c1e31097e3ef014da 100644
(file)
--- a/
wxPython/include/wx/wxPython/wxPython_int.h
+++ b/
wxPython/include/wx/wxPython/wxPython_int.h
@@
-1678,6
+1678,7
@@
extern wxPyApp *wxPythonApp;
if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxSize"))) \
rval = *ptr; \
else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { \
+ PyErr_Clear(); \
PyObject* o1 = PySequence_GetItem(ro, 0); \
PyObject* o2 = PySequence_GetItem(ro, 1); \
if (PyNumber_Check(o1) && PyNumber_Check(o2)) \