docstring patch has been submitted to SF

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

diff --git a/wxPython/SWIG/README.txt b/wxPython/SWIG/README.txt
index 7f42eaa6b466ba8f64458fb1bb8c29f03be74a24..a7d5ade2b89ee20a72b1ed3fee940775e7f10e77 100644 (file)
--- a/wxPython/SWIG/README.txt
+++ b/wxPython/SWIG/README.txt
@@ -19,6 +19,7 @@ swig.xmlout.patch          Fixes a couple problems in the XML output
                             newlines in attribute values were changed
                             to the #10; entity reference so they will
                             be preserved by parsers.
                             newlines in attribute values were changed
                             to the #10; entity reference so they will
                             be preserved by parsers.

+                            See SF Patch #883402

 
                             Also, added options for dumping or
                             writing to a file the XML of the parse
 
                             Also, added options for dumping or
                             writing to a file the XML of the parse


@@ -30,8 +31,8 @@ swig.xmlout.patch          Fixes a couple problems in the XML output
 
 
 ------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------

-These patches have already been checked in to SWIG's CVS and will be
-in the 1.3.20 release.
+These patches have already been checked in to SWIG's CVS and are in
+the 1.3.20 release.

 ------------------------------------------------------------------------
 
 swig.SplitLines.patch      Adds a new SplitLines function to the DOH
 ------------------------------------------------------------------------
 
 swig.SplitLines.patch      Adds a new SplitLines function to the DOH

diff --git a/wxPython/SWIG/swig.python-docstring.patch b/wxPython/SWIG/swig.python-docstring.patch
index 600cff333ba3d0fce559f6542c6de74e496d641a..8b2c1ea83956a29424b67efbd80c49a2992d25aa 100644 (file)
--- a/wxPython/SWIG/swig.python-docstring.patch
+++ b/wxPython/SWIG/swig.python-docstring.patch
@@ -4,7 +4,7 @@ RCS file: /cvsroot/SWIG/Source/Modules/python.cxx,v
 retrieving revision 1.39
 diff -u -4 -r1.39 python.cxx
 --- Source/Modules/python.cxx  22 Jan 2004 22:42:17 -0000      1.39
 retrieving revision 1.39
 diff -u -4 -r1.39 python.cxx
 --- Source/Modules/python.cxx  22 Jan 2004 22:42:17 -0000      1.39

-+++ Source/Modules/python.cxx  22 Jan 2004 23:39:03 -0000
++++ Source/Modules/python.cxx  24 Jan 2004 00:18:12 -0000

 @@ -50,8 +50,17 @@
  static  int       have_constructor;
  static  int       have_repr;
 @@ -50,8 +50,17 @@
  static  int       have_constructor;
  static  int       have_repr;


@@ -52,7 +52,7 @@ diff -u -4 -r1.39 python.cxx
    }
  
  
    }
  
  

-@@ -441,8 +456,256 @@
+@@ -441,8 +456,248 @@

    }
  
  
    }
  
  


@@ -96,14 +96,6 @@ diff -u -4 -r1.39 python.cxx
 +      have_auto = (autodoc != NULL && Len(autodoc) > 0);
 +    }
 +    
 +      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:
 +    //
 +    //      """
 +    // If there is more than one line then make docstrings like this:
 +    //
 +    //      """


@@ -309,7 +301,7 @@ diff -u -4 -r1.39 python.cxx
     *    Check if there is a %addtofunc directive and it has text
     * ------------------------------------------------------------ */
  
     *    Check if there is a %addtofunc directive and it has text
     * ------------------------------------------------------------ */
  

-@@ -1698,9 +1961,11 @@
+@@ -1698,9 +1953,11 @@

          Printf(f_shadow, modern ? "(object)" : "(_object)");
        }
        }
          Printf(f_shadow, modern ? "(object)" : "(_object)");
        }
        }


@@ -322,7 +314,7 @@ diff -u -4 -r1.39 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);
          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);

-@@ -1833,16 +2098,22 @@
+@@ -1833,16 +2090,22 @@

          Delete(pyaction);
          Printv(f_shadow,pycode,"\n",NIL);
        } else {
          Delete(pyaction);
          Printv(f_shadow,pycode,"\n",NIL);
        } else {


@@ -352,7 +344,7 @@ diff -u -4 -r1.39 python.cxx
          }
  
        }
          }
  
        }

-@@ -1857,14 +2128,20 @@
+@@ -1857,14 +2120,20 @@

    virtual int staticmemberfunctionHandler(Node *n) {
      String *symname = Getattr(n,"sym:name");
      Language::staticmemberfunctionHandler(n);
    virtual int staticmemberfunctionHandler(Node *n) {
      String *symname = Getattr(n,"sym:name");
      Language::staticmemberfunctionHandler(n);


@@ -377,7 +369,7 @@ diff -u -4 -r1.39 python.cxx
                 " = staticmethod(", symname, ")\n", NIL);
  
          if (!modern) {
                 " = staticmethod(", symname, ")\n", NIL);
  
          if (!modern) {

-@@ -1949,8 +2226,10 @@
+@@ -1949,8 +2218,10 @@

            }
  
              Printv(f_shadow, tab4, "def __init__(self, *args",
            }
  
              Printv(f_shadow, tab4, "def __init__(self, *args",


@@ -388,7 +380,7 @@ diff -u -4 -r1.39 python.cxx
              if (!modern) {
                Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', ", 
                       funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL);
              if (!modern) {
                Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', ", 
                       funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL);

-@@ -1964,9 +2243,9 @@
+@@ -1964,9 +2235,9 @@

                Printv(f_shadow, tab8, "self.thisown = 1\n", NIL);
                Printv(f_shadow, tab8, "del newobj.thisown\n", NIL);
              }
                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.39 python.cxx
          }
          have_constructor = 1;
        } else {
          }
          have_constructor = 1;
        } else {

-@@ -1982,8 +2261,10 @@
+@@ -1982,8 +2253,10 @@

          } else {
  
              Printv(f_shadow_stubs, "\ndef ", symname, "(*args",
          } else {
  
              Printv(f_shadow_stubs, "\ndef ", symname, "(*args",


@@ -410,7 +402,7 @@ diff -u -4 -r1.39 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) )
                     funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL);
            Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
              if ( have_addtofunc(n) )

-@@ -2015,13 +2296,15 @@
+@@ -2015,13 +2288,15 @@

        Delete(pyaction);
        Printv(f_shadow,pycode,"\n", NIL);
        } else {
        Delete(pyaction);
        Printv(f_shadow,pycode,"\n", NIL);
        } else {