RTTI simplifications

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

diff --git a/wxPython/wxSWIG/Modules/pycpp.cxx b/wxPython/wxSWIG/Modules/pycpp.cxx
index 256a4399d94ffbb1b92156d74db5482096efcc6e..b4021d72567ec811a90eab9cbceeb96715080c96 100644 (file)
--- a/wxPython/wxSWIG/Modules/pycpp.cxx
+++ b/wxPython/wxSWIG/Modules/pycpp.cxx
@@ -146,7 +146,7 @@ void PYTHON::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l)
     if (docstring && doc_entry) {
       *pyclass << tab8 << "\"\"\"" << add_docstring(doc_entry) << "\"\"\"\n";
     }
     if (docstring && doc_entry) {
       *pyclass << tab8 << "\"\"\"" << add_docstring(doc_entry) << "\"\"\"\n";
     }

-    *pyclass << tab8 << "val = apply(" << module << "." << name_member(realname,class_name) << ",(self,) + _args, _kwargs)\n";
+    *pyclass << tab8 << "val = " << module << "." << name_member(realname,class_name) << "(self, *_args, **_kwargs)\n";

 
     // Check to see if the return type is an object
     if ((hash.lookup(t->name)) && (t->is_pointer <= 1)) {
 
     // Check to see if the return type is an object
     if ((hash.lookup(t->name)) && (t->is_pointer <= 1)) {


@@ -216,7 +216,7 @@ void PYTHON::cpp_constructor(char *name, char *iname, ParmList *l) {
       if (docstring && doc_entry)
        *construct << tab8 << "\"\"\"" << add_docstring(doc_entry) << "\"\"\"\n";
 
       if (docstring && doc_entry)
        *construct << tab8 << "\"\"\"" << add_docstring(doc_entry) << "\"\"\"\n";
 

-      *construct << tab8 << "self.this = apply(" << module << "." << name_construct(realname) << ",_args,_kwargs)\n";
+      *construct << tab8 << "self.this = " << module << "." << name_construct(realname) << "(*_args,**_kwargs)\n";

       *construct << tab8 << "self.thisown = 1\n";
       emitAddPragmas(*construct,"__init__",tab8);
       have_constructor = 1;
       *construct << tab8 << "self.thisown = 1\n";
       emitAddPragmas(*construct,"__init__",tab8);
       have_constructor = 1;


@@ -226,8 +226,8 @@ void PYTHON::cpp_constructor(char *name, char *iname, ParmList *l) {
       // function for it.
 
       *additional << "def " << realname << "(*_args,**_kwargs):\n";
       // function for it.
 
       *additional << "def " << realname << "(*_args,**_kwargs):\n";

-      *additional << tab4 << "val = " << class_name << "Ptr(apply("
-                 << module << "." << name_construct(realname) << ",_args,_kwargs))\n"
+      *additional << tab4 << "val = " << class_name << "Ptr("
+                 << module << "." << name_construct(realname) << "(*_args,**_kwargs))\n"

                   << tab4 << "val.thisown = 1\n";
       emitAddPragmas(*additional, realname, tab4);
       *additional << tab4 << "return val\n\n";
                   << tab4 << "val.thisown = 1\n";
       emitAddPragmas(*additional, realname, tab4);
       *additional << tab4 << "return val\n\n";


@@ -260,10 +260,15 @@ void PYTHON::cpp_destructor(char *name, char *newname) {
       else realname = name;
     }
 
       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);
     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) {
 
     have_destructor = 1;
     if (doc_entry) {


@@ -317,7 +322,7 @@ void PYTHON::cpp_close_class() {
     if (!have_repr) {
       // Supply a repr method for this class
       repr << tab4 << "def __repr__(self):\n"
     if (!have_repr) {
       // Supply a repr method for this class
       repr << tab4 << "def __repr__(self):\n"

-          << tab8 << "return \"<C " << class_name <<" instance at %s>\" % (self.this,)\n";
+          << tab8 << "return \"<%s.%s instance; proxy of C++ " << class_name <<" instance at %s>\" % (self.__class__.__module__, self.__class__.__name__, self.this)\n";

 
       classes << repr;
       emitAddPragmas(classes,"__class__",tab4);
 
       classes << repr;
       emitAddPragmas(classes,"__class__",tab4);