X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1de47c7cb466d25dcb2135f5315d9c06927e0f2f..90805926b75bcdc8466b1736df4413c7581cdc30:/wxPython/SWIG/swig.python-docstring.patch

diff --git a/wxPython/SWIG/swig.python-docstring.patch b/wxPython/SWIG/swig.python-docstring.patch
index c692852bf8..47aac607ab 100644
--- a/wxPython/SWIG/swig.python-docstring.patch
+++ b/wxPython/SWIG/swig.python-docstring.patch
@@ -1,11 +1,11 @@
 Index: Source/Modules/python.cxx
 ===================================================================
 RCS file: /cvsroot/SWIG/Source/Modules/python.cxx,v
-retrieving revision 1.38
-diff -u -4 -r1.38 python.cxx
---- Source/Modules/python.cxx	21 Jan 2004 01:33:07 -0000	1.38
-+++ Source/Modules/python.cxx	22 Jan 2004 01:59:33 -0000
-@@ -54,8 +54,17 @@
+retrieving revision 1.40
+diff -u -4 -r1.40 python.cxx
+--- Source/Modules/python.cxx	24 Jan 2004 00:25:31 -0000	1.40
++++ Source/Modules/python.cxx	30 Jan 2004 22:22:16 -0000
+@@ -50,8 +50,17 @@
  static  int       have_constructor;
  static  int       have_repr;
  static  String   *real_classname;
@@ -23,7 +23,7 @@ diff -u -4 -r1.38 python.cxx
  Python Options (available with -python)\n\
       -ldflags        - Print runtime libraries to link with\n\
       -globals <name> - Set <name> used to access C global variable [default: 'cvar']\n\
-@@ -421,17 +430,23 @@
+@@ -417,17 +426,23 @@
     *    functions.
     * ------------------------------------------------------------ */
  
@@ -52,7 +52,7 @@ diff -u -4 -r1.38 python.cxx
    }
  
  
-@@ -445,8 +460,256 @@
+@@ -441,8 +456,248 @@
    }
  
  
@@ -96,14 +96,6 @@ diff -u -4 -r1.38 python.cxx
 +      have_auto = (autodoc != NULL && Len(autodoc) > 0);
 +    }
 +    
-+//     if ( have_auto && have_ds )
-+//       doc = NewStringf("%s%s\n\n%s%s", triple_double, autodoc, str, triple_double);
-+//     else if ( !have_auto && have_ds )
-+//       doc = NewStringf("%s%s%s", triple_double, str, triple_double);
-+//     else
-+//       doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double);
-+
-+    
 +    // If there is more than one line then make docstrings like this:
 +    //
 +    //      """
@@ -224,7 +216,7 @@ diff -u -4 -r1.38 python.cxx
 +          break;
 +        
 +        case AUTODOC_STATICFUNC:
-+          Printf(doc, "%s.%s(%s)", class_name, symname, make_autodocParmList(n, showTypes));
++          Printf(doc, "%s(%s)", symname, make_autodocParmList(n, showTypes));
 +          if (type) Printf(doc, " -> %s", type);
 +          break;
 +                      
@@ -309,7 +301,7 @@ diff -u -4 -r1.38 python.cxx
     *    Check if there is a %addtofunc directive and it has text
     * ------------------------------------------------------------ */
  
-@@ -1702,9 +1965,11 @@
+@@ -1731,9 +1986,11 @@
  	  Printf(f_shadow, modern ? "(object)" : "(_object)");
  	}
        }
@@ -322,7 +314,7 @@ diff -u -4 -r1.38 python.cxx
          Printv(f_shadow,tab4,"__swig_setmethods__ = {}\n",NIL);
          if (Len(base_class)) {
            Printf(f_shadow,"%sfor _s in [%s]: __swig_setmethods__.update(_s.__swig_setmethods__)\n",tab4,base_class);
-@@ -1837,16 +2102,22 @@
+@@ -1866,16 +2123,22 @@
  	  Delete(pyaction);
  	  Printv(f_shadow,pycode,"\n",NIL);
  	} else {
@@ -352,7 +344,7 @@ diff -u -4 -r1.38 python.cxx
          }
  
        }
-@@ -1861,14 +2132,20 @@
+@@ -1890,14 +2153,20 @@
    virtual int staticmemberfunctionHandler(Node *n) {
      String *symname = Getattr(n,"sym:name");
      Language::staticmemberfunctionHandler(n);
@@ -377,7 +369,7 @@ diff -u -4 -r1.38 python.cxx
                 " = staticmethod(", symname, ")\n", NIL);
  
          if (!modern) {
-@@ -1953,8 +2230,10 @@
+@@ -1982,8 +2251,10 @@
   	    }
  
              Printv(f_shadow, tab4, "def __init__(self, *args",
@@ -388,7 +380,7 @@ diff -u -4 -r1.38 python.cxx
              if (!modern) {
                Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', ", 
                       funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL);
-@@ -1968,9 +2247,9 @@
+@@ -1997,9 +2268,9 @@
                Printv(f_shadow, tab8, "self.thisown = 1\n", NIL);
                Printv(f_shadow, tab8, "del newobj.thisown\n", NIL);
              }
@@ -399,7 +391,7 @@ diff -u -4 -r1.38 python.cxx
    	  }
  	  have_constructor = 1;
  	} else {
-@@ -1986,8 +2265,10 @@
+@@ -2015,8 +2286,10 @@
  	  } else {
  
              Printv(f_shadow_stubs, "\ndef ", symname, "(*args",
@@ -410,7 +402,7 @@ diff -u -4 -r1.38 python.cxx
                     funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL);
  	    Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
              if ( have_addtofunc(n) )
-@@ -2019,13 +2300,15 @@
+@@ -2048,13 +2321,15 @@
  	Delete(pyaction);
  	Printv(f_shadow,pycode,"\n", NIL);
        } else {