Removed deprecation warnings in OGL and Gizmos

[wxWidgets.git] / wxPython / wxSWIG / Modules / pycpp.cxx

diff --git a/wxPython/wxSWIG/Modules/pycpp.cxx b/wxPython/wxSWIG/Modules/pycpp.cxx
index 256a4399d94ffbb1b92156d74db5482096efcc6e..89cd85ffd56da191f6e3602ccec52ea04b832b4f 100644 (file)
--- a/wxPython/wxSWIG/Modules/pycpp.cxx
+++ b/wxPython/wxSWIG/Modules/pycpp.cxx
@@ -260,10 +260,15 @@ void PYTHON::cpp_destructor(char *name, char *newname) {
       else realname = name;
     }
 
-    *pyclass << tab4 << "def __del__(self," << module << "=" << module << "):\n";
+    char* dfname = name_destroy(realname);
+
+    *pyclass << tab4 << "def __del__(self, " << "delfunc=" << module<< "." << dfname << "):\n";
     emitAddPragmas(*pyclass,"__del__",tab8);
-    *pyclass << tab8 << "if self.thisown == 1 :\n"
-            << tab8 << tab4 << module << "." << name_destroy(realname) << "(self)\n";
+    *pyclass << tab8 << "if self.thisown == 1:\n"
+             << tab8 << tab4 << "try:\n"
+            << tab8 << tab8 << "delfunc(self)\n"
+             << tab8 << tab4 << "except:\n"
+            << tab8 << tab8 << "pass\n";
 
     have_destructor = 1;
     if (doc_entry) {