'[1219035] cleanup: miscellaneous' and minor source cleaning.

[wxWidgets.git] / wxPython / src / msw / grid_wrap.cpp

diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp
index 8e51aeb8c14d222892597b9f8ec3071573e6a39e..6b421421037ecbdc316803b288c1e71be9d2e582 100644 (file)
--- a/wxPython/src/msw/grid_wrap.cpp
+++ b/wxPython/src/msw/grid_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   


@@ -10493,15 +10494,11 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *, PyObject *args, PyObject
         int i, len=PySequence_Length(obj2);
         for (i=0; i<len; i++) {
             PyObject* item = PySequence_GetItem(obj2, i);
         int i, len=PySequence_Length(obj2);
         for (i=0; i<len; i++) {
             PyObject* item = PySequence_GetItem(obj2, i);

-#if wxUSE_UNICODE
-            PyObject* str  = PyObject_Unicode(item);
-#else
-            PyObject* str  = PyObject_Str(item);
-#endif
+            wxString* s = wxString_in_helper(item);

             if (PyErr_Occurred())  SWIG_fail;
             if (PyErr_Occurred())  SWIG_fail;

-            arg3->Add(Py2wxString(str));
+            arg3->Add(*s);
+            delete s;

             Py_DECREF(item);
             Py_DECREF(item);

-            Py_DECREF(str);

         }
     }
     {
         }
     }
     {