+    // These should be deprecated in favor of the PlatformInfo tuple built below...
+    PyDict_SetItemString(wxPython_dict, "Platform", PyString_FromString(wxPlatform));
+    PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE));
+    PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug));
+
+    // Make a tuple of strings that gives more info about the platform.
+    PyObject* PlatInfo = PyList_New(0);
+    PyObject* obj;
+
+#define _AddInfoString(st) \
+    obj = PyString_FromString(st); \
+    PyList_Append(PlatInfo, obj); \
+    Py_DECREF(obj)
+
+    _AddInfoString(wxPlatform);
+    _AddInfoString(wxPlatName);
+#if wxUSE_UNICODE
+    _AddInfoString("unicode");
+#else
+    _AddInfoString("ansi");
+#endif
+#ifdef __WXGTK__
+#ifdef __WXGTK20__
+    _AddInfoString("gtk2");
+#else
+    _AddInfoString("gtk1");
+#endif
+#endif
+#ifdef __WXDEBUG__
+    _AddInfoString("wx-assertions-on");
+#else
+    _AddInfoString("wx-assertions-off");
+#endif
+    _AddInfoString(wxPy_SWIG_VERSION);    
+    
+#undef _AddInfoString
+
+    PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo);
+    Py_DECREF(PlatInfo);
+    PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple);
+
+    RETURN_NONE();
+}
+
+
+
+//---------------------------------------------------------------------------
+
+// Check for existence of a wxApp, setting an exception if there isn't one.
+// This doesn't need to aquire the GIL because it should only be called from
+// an %exception before the lock is released.
+
+bool wxPyCheckForApp() {
+    if (wxTheApp != NULL)
+        return true;
+    else {
+        PyErr_SetString(wxPyNoAppError, "The wx.App object must be created first!");
+        return false;
+    }
+}
+
+//---------------------------------------------------------------------------
+
+void wxPyUserData_dtor(wxPyUserData* self) {
+    if (! wxPyDoingCleanup) {
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        Py_DECREF(self->m_obj);
+        self->m_obj = NULL;
+        wxPyEndBlockThreads(blocked);
+    }
+}
+
+
+void wxPyClientData_dtor(wxPyClientData* self) {
+    if (! wxPyDoingCleanup) {           // Don't do it during cleanup as Python
+                                        // may have already garbage collected the object...
+        if (self->m_incRef) {
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            Py_DECREF(self->m_obj);
+            wxPyEndBlockThreads(blocked);
+        }
+        self->m_obj = NULL;
+    }
+}
+
+
+
+// This is called when an OOR controled object is being destroyed.  Although
+// the C++ object is going away there is no way to force the Python object
+// (and all references to it) to die too.  This causes problems (crashes) in
+// wxPython when a python shadow object attempts to call a C++ method using
+// the now bogus pointer... So to try and prevent this we'll do a little black
+// magic and change the class of the python instance to a class that will
+// raise an exception for any attempt to call methods with it.  See
+// _wxPyDeadObject in _core_ex.py for the implementation of this class.
+void wxPyOORClientData_dtor(wxPyOORClientData* self) {
+
+    static PyObject* deadObjectClass = NULL;
+
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if (deadObjectClass == NULL) {
+        deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject");
+        // TODO:  Can not wxASSERT here because inside a wxPyBeginBlock Threads,
+        // will lead to a deadlock when it tries to aquire the GIL again.
+        //wxASSERT_MSG(deadObjectClass != NULL, wxT("Can't get _wxPyDeadObject class!"));
+        Py_INCREF(deadObjectClass);
+    }
+
+
+    // Only if there is more than one reference to the object and we are
+    // holding the OOR reference:
+    if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 && self->m_incRef) {
+        // bool isInstance = wxPyInstance_Check(self->m_obj);
+        // TODO same here
+        //wxASSERT_MSG(isInstance, wxT("m_obj not an instance!?!?!"));
+
+        // Call __del__, if there is one.
+        PyObject* func = PyObject_GetAttrString(self->m_obj, "__del__");
+        if (func) {
+            PyObject* rv = PyObject_CallMethod(self->m_obj, "__del__", NULL);
+            Py_XDECREF(rv);
+            Py_DECREF(func);
+        }
+        if (PyErr_Occurred())
+            PyErr_Clear();      // just ignore it for now
+
+
+        PyObject* dict = PyObject_GetAttrString(self->m_obj, "__dict__");
+        if (dict) {
+            // Clear the instance's dictionary
+            PyDict_Clear(dict);
+
+            // put the name of the old class into the instance, and then reset the
+            // class to be the dead class.
+            PyObject* klass = PyObject_GetAttrString(self->m_obj, "__class__");
+            PyObject* name =  PyObject_GetAttrString(klass, "__name__");
+            PyDict_SetItemString(dict, "_name", name);
+            PyObject_SetAttrString(self->m_obj, "__class__",  deadObjectClass);
+            //Py_INCREF(deadObjectClass);
+            Py_DECREF(klass);
+            Py_DECREF(name);
+        }
+    }
+
+    // m_obj is DECREF'd in the base class dtor...
+    wxPyEndBlockThreads(blocked);