Don't set a module attribute for the *_swigregister functions, just

call the one in the extension module directly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/SWIG/README.txt b/wxPython/SWIG/README.txt
index 329cc60bc41c6a6d5936e115d85112a715a93032..e4be61e76858efcd0bb0b8d710ae074590e22683 100644 (file)
--- a/wxPython/SWIG/README.txt
+++ b/wxPython/SWIG/README.txt
@@ -42,6 +42,8 @@ swig-1.3.29.patch
     Added support for dropping the leading wx from wxNames using
     %rename("%(wxpy)s") ""; 
 
     Added support for dropping the leading wx from wxNames using
     %rename("%(wxpy)s") ""; 
 

+    Don't set a module attribute for the *_swigregister functions,
+    just call the one in the extension module directly.

 
 ------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------
 

diff --git a/wxPython/SWIG/swig-1.3.29.patch b/wxPython/SWIG/swig-1.3.29.patch
index a0afbd9ac71f439b0c1ab61767be04339c1c07eb..0da5923ce4640d62d6eb3e9c4fb02800ef3f6c7f 100644 (file)
--- a/wxPython/SWIG/swig-1.3.29.patch
+++ b/wxPython/SWIG/swig-1.3.29.patch
@@ -4,7 +4,7 @@ RCS file: /cvsroot/swig/SWIG/Makefile.in,v
 retrieving revision 1.103
 diff -u -4 -r1.103 Makefile.in
 --- Makefile.in        10 Mar 2006 22:54:02 -0000      1.103
 retrieving revision 1.103
 diff -u -4 -r1.103 Makefile.in
 --- Makefile.in        10 Mar 2006 22:54:02 -0000      1.103

-+++ Makefile.in        14 May 2006 18:29:39 -0000
++++ Makefile.in        18 May 2006 15:25:54 -0000

 @@ -21,9 +21,9 @@
  
  source:
 @@ -21,9 +21,9 @@
  
  source:


@@ -33,7 +33,7 @@ RCS file: /cvsroot/swig/SWIG/Lib/typemaps/exception.swg,v
 retrieving revision 1.8
 diff -u -4 -r1.8 exception.swg
 --- Lib/typemaps/exception.swg 7 Mar 2006 00:14:10 -0000       1.8
 retrieving revision 1.8
 diff -u -4 -r1.8 exception.swg
 --- Lib/typemaps/exception.swg 7 Mar 2006 00:14:10 -0000       1.8

-+++ Lib/typemaps/exception.swg 14 May 2006 18:29:39 -0000
++++ Lib/typemaps/exception.swg 18 May 2006 15:25:54 -0000

 @@ -12,9 +12,9 @@
  
  /* macros for error manipulation */
 @@ -12,9 +12,9 @@
  
  /* macros for error manipulation */


@@ -51,7 +51,7 @@ RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v
 retrieving revision 1.203
 diff -u -4 -r1.203 python.cxx
 --- Source/Modules/python.cxx  16 Mar 2006 01:46:50 -0000      1.203
 retrieving revision 1.203
 diff -u -4 -r1.203 python.cxx
 --- Source/Modules/python.cxx  16 Mar 2006 01:46:50 -0000      1.203

-+++ Source/Modules/python.cxx  14 May 2006 18:29:39 -0000
++++ Source/Modules/python.cxx  18 May 2006 15:25:54 -0000

 @@ -39,9 +39,8 @@
  static  File         *f_directors_h = 0;
  static  File         *f_init = 0;
 @@ -39,9 +39,8 @@
  static  File         *f_directors_h = 0;
  static  File         *f_init = 0;


@@ -121,13 +121,26 @@ diff -u -4 -r1.203 python.cxx
        }
  
        if (name) {
        }
  
        if (name) {

+@@ -2793,10 +2789,10 @@
+         Printf(f_shadow_file,"%s.%s = new_instancemethod(%s.%s,None,%s)\n", 
+                class_name, symname, module, Swig_name_member(class_name,symname), class_name);
+       }
+       }
+-      Printf(f_shadow_file,"%s_swigregister = %s.%s_swigregister\n", class_name, module, class_name);
+-      Printf(f_shadow_file,"%s_swigregister(%s)\n", class_name, class_name,0);
++
++      Printf(f_shadow_file,"%s.%s_swigregister(%s)\n", module, class_name, class_name);
+       
+       shadow_indent = 0;
+       Printf(f_shadow_file,"%s\n", f_shadow_stubs);
+       Clear(f_shadow_stubs);

 Index: Source/Swig/misc.c
 ===================================================================
 RCS file: /cvsroot/swig/SWIG/Source/Swig/misc.c,v
 retrieving revision 1.57
 diff -u -4 -r1.57 misc.c
 --- Source/Swig/misc.c 6 Mar 2006 22:51:00 -0000       1.57
 Index: Source/Swig/misc.c
 ===================================================================
 RCS file: /cvsroot/swig/SWIG/Source/Swig/misc.c,v
 retrieving revision 1.57
 diff -u -4 -r1.57 misc.c
 --- Source/Swig/misc.c 6 Mar 2006 22:51:00 -0000       1.57

-+++ Source/Swig/misc.c 14 May 2006 18:29:39 -0000
++++ Source/Swig/misc.c 18 May 2006 15:25:54 -0000

 @@ -899,8 +899,26 @@
  }
  #endif
 @@ -899,8 +899,26 @@
  }
  #endif