change director order back, bad fix
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7739 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
3c5c038e86
commit
14e50ff653
4 changed files with 4 additions and 4 deletions
|
|
@ -79,7 +79,7 @@ String *Swig_director_declaration(Node *n) {
|
||||||
String *directorname = NewStringf("SwigDirector_%s", classname);
|
String *directorname = NewStringf("SwigDirector_%s", classname);
|
||||||
String *base = Getattr(n, "classtype");
|
String *base = Getattr(n, "classtype");
|
||||||
String *declaration = Swig_class_declaration(n, directorname);
|
String *declaration = Swig_class_declaration(n, directorname);
|
||||||
Printf(declaration, " : virtual public Swig::Director, public %s {\n", base);
|
Printf(declaration, " : public %s, public Swig::Director {\n", base);
|
||||||
Delete(classname);
|
Delete(classname);
|
||||||
Delete(directorname);
|
Delete(directorname);
|
||||||
return declaration;
|
return declaration;
|
||||||
|
|
|
||||||
|
|
@ -1833,7 +1833,7 @@ public:
|
||||||
String *basetype = Getattr(parent, "classtype");
|
String *basetype = Getattr(parent, "classtype");
|
||||||
String *target = Swig_method_decl(decl, classname, parms, 0, 0);
|
String *target = Swig_method_decl(decl, classname, parms, 0, 0);
|
||||||
call = Swig_csuperclass_call(0, basetype, superparms);
|
call = Swig_csuperclass_call(0, basetype, superparms);
|
||||||
Printf( w->def, "%s::%s: Swig::Director(self), %s { }", classname, target, call );
|
Printf( w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call );
|
||||||
Delete(target);
|
Delete(target);
|
||||||
Wrapper_print(w, f_directors);
|
Wrapper_print(w, f_directors);
|
||||||
Delete(call);
|
Delete(call);
|
||||||
|
|
|
||||||
|
|
@ -1816,7 +1816,7 @@ public:
|
||||||
String *basetype = Getattr(parent, "classtype");
|
String *basetype = Getattr(parent, "classtype");
|
||||||
String *target = Swig_method_decl(decl, classname, parms, 0, 0);
|
String *target = Swig_method_decl(decl, classname, parms, 0, 0);
|
||||||
call = Swig_csuperclass_call(0, basetype, superparms);
|
call = Swig_csuperclass_call(0, basetype, superparms);
|
||||||
Printf(w->def, "%s::%s: Swig::Director(self), %s { \n", classname, target, call);
|
Printf(w->def, "%s::%s: %s, Swig::Director(self) { \n", classname, target, call);
|
||||||
Printf(w->def, " SWIG_DIRECTOR_RGTR((%s *)this, this); \n", basetype);
|
Printf(w->def, " SWIG_DIRECTOR_RGTR((%s *)this, this); \n", basetype);
|
||||||
Printf(w->def, "}\n");
|
Printf(w->def, "}\n");
|
||||||
Delete(target);
|
Delete(target);
|
||||||
|
|
|
||||||
|
|
@ -2152,7 +2152,7 @@ public:
|
||||||
String *basetype = Getattr(parent, "classtype");
|
String *basetype = Getattr(parent, "classtype");
|
||||||
String *target = Swig_method_decl(decl, classname, parms, 0, 0);
|
String *target = Swig_method_decl(decl, classname, parms, 0, 0);
|
||||||
call = Swig_csuperclass_call(0, basetype, superparms);
|
call = Swig_csuperclass_call(0, basetype, superparms);
|
||||||
Printf(w->def, "%s::%s: Swig::Director(self), %s { }", classname, target, call);
|
Printf(w->def, "%s::%s: %s, Swig::Director(self) { }", classname, target, call);
|
||||||
Delete(target);
|
Delete(target);
|
||||||
Wrapper_print(w, f_directors);
|
Wrapper_print(w, f_directors);
|
||||||
Delete(call);
|
Delete(call);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue