fixed extraneous scrolling when scrollbars are added/removed (patch 788026; bug 746618)

[wxWidgets.git] / wxPython / src / libpy.c

diff --git a/wxPython/src/libpy.c b/wxPython/src/libpy.c
index 7e400062a839584cd8fca2ec59e730fa6af70cde..aba06557686f63289620fb26ff3e322c1545a181 100644 (file)
--- a/wxPython/src/libpy.c
+++ b/wxPython/src/libpy.c
@@ -402,6 +402,7 @@ SWIGSTATICRUNTIME(char *)
 SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type) {
   PyObject *sobj = obj;
   char     *str;
+
   if (!PyString_Check(obj)) {
       if (!PyInstance_Check(obj) || !(sobj = PyObject_GetAttrString(obj,"this")))
           return "";
@@ -409,6 +410,8 @@ SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type) {
       Py_DECREF(sobj);
   }
   str = PyString_AsString(sobj);
+  if (str == NULL)
+      return "";
   return SWIG_GetPtr(str,ptr,type);
 }