From: Robin Dunn <robin@alldunn.com>
Date: Wed, 17 May 2006 04:14:20 +0000 (+0000)
Subject: Added SWIG patch that enables the wx-dropping renames to be done
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d9f09ac42cede57f6e7586e509fe6a387a07d671?hp=29a41103aad2860742a6d71942c9b9e14fe4a79d

Added SWIG patch that enables the wx-dropping renames to be done
internally instead of needing to be generated in a second pass after
processing the XML output.


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

diff --git a/wxPython/SWIG/README.txt b/wxPython/SWIG/README.txt
index 43a91ee864..329cc60bc4 100644
--- a/wxPython/SWIG/README.txt
+++ b/wxPython/SWIG/README.txt
@@ -39,6 +39,8 @@ swig-1.3.29.patch
     Changed the exception message used for TypeErrors to make a little
     more sense.
 
+    Added support for dropping the leading wx from wxNames using
+    %rename("%(wxpy)s") ""; 
 
 
 ------------------------------------------------------------------------
diff --git a/wxPython/SWIG/swig-1.3.29.patch b/wxPython/SWIG/swig-1.3.29.patch
index c6ed275851..a0afbd9ac7 100644
--- a/wxPython/SWIG/swig-1.3.29.patch
+++ b/wxPython/SWIG/swig-1.3.29.patch
@@ -1,10 +1,39 @@
+Index: Makefile.in
+===================================================================
+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
++++ Makefile.in	14 May 2006 18:29:39 -0000
+@@ -21,9 +21,9 @@
+ 
+ source:
+ 	@cd $(SOURCE) && $(MAKE)
+ 
+-libfiles: Lib/swigwarn.swg
++libfiles: $(srcdir)/Lib/swigwarn.swg
+ 
+ .PHONY: source libfiles
+ 
+ #####################################################################
+@@ -339,9 +339,9 @@
+ #####################################################################
+ # Update the Lib/swigwarn.swg file
+ #####################################################################
+ 
+-Lib/swigwarn.swg: Source/Include/swigwarn.h
++$(srcdir)/Lib/swigwarn.swg: $(srcdir)/Source/Include/swigwarn.h
+ 	echo "/* Automatically generated file containing all the swig warning codes.  */" > $@
+ 	echo "/* Do not modify this file by hand, change 'Source/Include/swigwarn.h'  */" >> $@
+ 	echo  "/* and use the command 'make Lib/swigwarn.swg' instead.                 */" >> $@
+ 	echo >> $@; echo >> $@
 Index: Lib/typemaps/exception.swg
 ===================================================================
 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
-+++ Lib/typemaps/exception.swg	17 Mar 2006 00:10:52 -0000
++++ Lib/typemaps/exception.swg	14 May 2006 18:29:39 -0000
 @@ -12,9 +12,9 @@
  
  /* macros for error manipulation */
@@ -22,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
-+++ Source/Modules/python.cxx	17 Mar 2006 00:10:52 -0000
++++ Source/Modules/python.cxx	14 May 2006 18:29:39 -0000
 @@ -39,9 +39,8 @@
  static  File         *f_directors_h = 0;
  static  File         *f_init = 0;
@@ -92,3 +121,49 @@ diff -u -4 -r1.203 python.cxx
        }
  
        if (name) {
+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
+@@ -899,8 +899,26 @@
+ }
+ #endif
+ 
+ 
++
++/* -----------------------------------------------------------------------------
++ * Swig_string_wxpy()
++ *
++ * Drop a leading 'wx' for all wxNames, except for wxEVT*
++ * ----------------------------------------------------------------------------- */
++String *Swig_string_wxpy(String *s) {
++  String* ns = NewStringEmpty();
++  char* cptr = Char(s);
++  if (cptr[0] == 'w' && cptr[1] == 'x') {
++    if ( ! (cptr[2] == 'E' && cptr[3] == 'V' && cptr[4] == 'T')) {
++      ns = NewString(&cptr[2]);
++    }
++  }
++  return ns;
++}
++
++
+ /* -----------------------------------------------------------------------------
+  * Swig_init()
+  *
+  * Initialize the SWIG core
+@@ -928,8 +946,11 @@
+   DohEncoding("undercase", Swig_string_ucase);
+   DohEncoding("firstuppercase", Swig_string_first_upper);
+   DohEncoding("firstlowercase", Swig_string_first_lower);
+ 
++  /* wxPython's rename encoder */
++  DohEncoding("wxpy", Swig_string_wxpy);
++
+   /* Initialize the swig keys */
+   Swig_keys_init();
+ 
+   /* Initialize typemaps */