diff --git a/wxPython/src/gtk/controls2.cpp b/wxPython/src/gtk/controls2.cpp
index a333f818c9..9659feb790 100644
--- a/wxPython/src/gtk/controls2.cpp
+++ b/wxPython/src/gtk/controls2.cpp
@@ -1,5 +1,5 @@
 /*
- * FILE : gtk/controls2.cpp
+ * FILE : src/gtk/controls2.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -150,7 +150,9 @@ public:
     }
 
     void SetData(PyObject* obj) {
+        bool doSave = wxPyRestoreThread();
         Py_DECREF(m_obj);
+        wxPySaveThread(doSave);
         m_obj = obj;
         Py_INCREF(obj);
     }