From 3c1705d91193010a2dd612dfe050b89da1773e21 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 23 Dec 2004 20:53:38 +0000 Subject: [PATCH] Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back some things that were changed/removed from my patch I submitted to them.) Since it is now possible easily and simply share the SWIG type tables across modules I reverted to always using the stock SWIG runtime instead of my slightly hacked up version of it exported via the wxPython C API. The %name directive is now deprecated so replaced most uses of it with a custom %Rename macro that uses %rename internally. These will evetually need to be replaced with a DocDecl macro when docstrings are added. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/stc/stc.h | 2 +- contrib/src/stc/stc.h.in | 2 +- include/wx/stc/stc.h | 2 +- src/stc/stc.h.in | 2 +- wxPython/SWIG/README.txt | 39 +- wxPython/SWIG/swig-1.3.24.patch | 182 ++++++ wxPython/SWIG/swig.python-2.patch | 891 ------------------------------ wxPython/docs/CHANGES.txt | 38 +- 8 files changed, 254 insertions(+), 904 deletions(-) create mode 100644 wxPython/SWIG/swig-1.3.24.patch delete mode 100644 wxPython/SWIG/swig.python-2.patch diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h index b4e6266ed7..10519a61b7 100644 --- a/contrib/include/wx/stc/stc.h +++ b/contrib/include/wx/stc/stc.h @@ -1456,7 +1456,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPySTCNameStr); - %name(PreStyledTextCtrl) wxStyledTextCtrl(); + %RenameCtor(PreStyledTextCtrl, wxStyledTextCtrl()); #else wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY, diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in index fe3f32e90f..6fd444087a 100644 --- a/contrib/src/stc/stc.h.in +++ b/contrib/src/stc/stc.h.in @@ -90,7 +90,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPySTCNameStr); - %%name(PreStyledTextCtrl) wxStyledTextCtrl(); + %%RenameCtor(PreStyledTextCtrl, wxStyledTextCtrl()); #else wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY, diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index b4e6266ed7..10519a61b7 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -1456,7 +1456,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPySTCNameStr); - %name(PreStyledTextCtrl) wxStyledTextCtrl(); + %RenameCtor(PreStyledTextCtrl, wxStyledTextCtrl()); #else wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY, diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index fe3f32e90f..6fd444087a 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -90,7 +90,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPySTCNameStr); - %%name(PreStyledTextCtrl) wxStyledTextCtrl(); + %%RenameCtor(PreStyledTextCtrl, wxStyledTextCtrl()); #else wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY, diff --git a/wxPython/SWIG/README.txt b/wxPython/SWIG/README.txt index 72f8ee8417..b5a4a4bf5c 100644 --- a/wxPython/SWIG/README.txt +++ b/wxPython/SWIG/README.txt @@ -1,5 +1,5 @@ -SWIG 1.3 Patches -================ +SWIG 1.3.x Patches +================== This directory holds a set of patches for the CVS version of SWIG that are required if you wish to use SWIG for wxPython development, or for @@ -8,15 +8,44 @@ wxPython. These have been submitted to SWIG's SourceForge patch tracker, so hopefully they will get incorporated into the main SWIG source tree soon. -wxPython currently uses the 1.3.22 version of SWIG, which you can get -from https://sourceforge.net/projects/swig/, plus the patches in this +wxPython currently uses the 1.3.24 version of SWIG, which you can get +from https://sourceforge.net/projects/swig/, plus the patch(es) in this directory. Download the SWIG sources, apply the patch(es) here and -then build as normal. +then build as normal. If you want to use both the patched version of +SWIG and the stock version, then you can configure the patched version +to use a different --prefix and then specify that executable when +running setup.py, like this: + python setup.py SWIG=/path/to/my/swig [other params] ------------------------------------------------------------------------ +swig-1.3.24.patch + + A bug was introduced in SWIG 1.3.23 and remains in 1.3.24 that + causes compilation problems with wxPython (copies are being made + of objects that don't have a copy constructor.) This patch fixes + the code generator to use a reference to the object instead of + making a copy. + + Part of my autodoc patch was disabled becuase a unit-test failed. + I was not able to duplicate the failure so I re-enabled that + section of code in this patch. + + Don't generate the autodocs string for a class if it has a + docstring attribute. + + Some typos fixed, etc. + + + + +------------------------------------------------------------------------ +This patch was added to SWIG's CVS on 10/2/2004 and a modified version +of it is in 1.3.23 and 1.3.24. +------------------------------------------------------------------------ + swig.python-2.patch diff --git a/wxPython/SWIG/swig-1.3.24.patch b/wxPython/SWIG/swig-1.3.24.patch new file mode 100644 index 0000000000..9ece48450e --- /dev/null +++ b/wxPython/SWIG/swig-1.3.24.patch @@ -0,0 +1,182 @@ +? .configure +? .emacs.desktop +? .test +? mytests +? switch_cvs.py +? Source/Modules/mystuff +Index: Doc/Manual/Python.html +=================================================================== +RCS file: /cvsroot/swig/SWIG/Doc/Manual/Python.html,v +retrieving revision 1.20 +diff -u -4 -r1.20 Python.html +--- Doc/Manual/Python.html 25 Oct 2004 20:42:08 -0000 1.20 ++++ Doc/Manual/Python.html 23 Dec 2004 20:14:06 -0000 +@@ -3869,10 +3869,10 @@ + +

26.10 Docstring Features

+ + +-Usign docstrings in Python code is becoming more and more important +-ans more tools are coming on the scene that take advantage of them, ++Using docstrings in Python code is becoming more and more important ++and more tools are coming on the scene that take advantage of them, + everything from full-blown documentaiton generators to class browsers + and popup call-tips in Python-aware IDEs. Given the way that SWIG + generates the proxy code by default, your users will normally get + something like "function_name(*args)" in the popup calltip of +Index: Source/Modules/python.cxx +=================================================================== +RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v +retrieving revision 1.81 +diff -u -4 -r1.81 python.cxx +--- Source/Modules/python.cxx 13 Dec 2004 22:12:47 -0000 1.81 ++++ Source/Modules/python.cxx 23 Dec 2004 20:14:07 -0000 +@@ -74,9 +74,9 @@ + -modern - Use modern python features only, without compatibility code\n\ + -apply - Use apply() in proxy classes\n\ + -new_vwm - New value wrapper mode, use only when everything else fails \n\ + -new_repr - Use more informative version of __repr__ in proxy classes\n\ +- -old_repr - Use shorter ald old version of __repr__ in proxy classes\n\ ++ -old_repr - Use shorter and old version of __repr__ in proxy classes\n\ + -noexcept - No automatic exception handling\n\ + -noh - Don't generate the output header file\n\ + -noproxy - Don't generate proxy classes \n\n"; + +@@ -749,10 +749,15 @@ + + // Do the param type too? + if (showTypes) { + type = SwigType_base(type); +- lookup = Swig_symbol_clookup(type, 0); +- if (lookup) type = Getattr(lookup, "sym:name"); ++ SwigType* qt = SwigType_typedef_resolve_all(type); ++ if (SwigType_isenum(qt)) ++ type = NewString("int"); ++ else { ++ lookup = Swig_symbol_clookup(type, 0); ++ if (lookup) type = Getattr(lookup, "sym:name"); ++ } + Printf(doc, "%s ", type); + } + + if (name) { +@@ -853,13 +858,19 @@ + } + + switch ( ad_type ) { + case AUTODOC_CLASS: +- if (CPlusPlus) { +- Printf(doc, "Proxy of C++ %s class", class_name); +- } else { +- Printf(doc, "Proxy of C %s struct", class_name); +- } ++ { ++ // Only do the autodoc if there isn't a docstring for the class ++ String* str = Getattr(n, "feature:docstring"); ++ if (str == NULL || Len(str) == 0) { ++ if (CPlusPlus) { ++ Printf(doc, "Proxy of C++ %s class", class_name); ++ } else { ++ Printf(doc, "Proxy of C %s struct", class_name); ++ } ++ } ++ } + break; + case AUTODOC_CTOR: + if ( Strcmp(class_name, symname) == 0) { + String* paramList = make_autodocParmList(n, showTypes); +@@ -1027,10 +1038,12 @@ + Printf(methods,"\t { (char *)\"%s\", (PyCFunction) %s, METH_VARARGS | METH_KEYWORDS, ", name, function); + + if (n && Getattr(n,"feature:callback")) { + if (have_docstring(n)) { ++ String* ds = docstring(n, AUTODOC_FUNC, "", false); ++ Replaceall(ds, "\n", "\\n"); + Printf(methods,"(char *)\"%s\\nswig_ptr: %s\"", +- docstring(n, AUTODOC_FUNC, "", false), ++ ds, + Getattr(n,"feature:callback:name")); + } else { + Printf(methods,"(char *)\"swig_ptr: %s\"",Getattr(n,"feature:callback:name")); + } +@@ -1950,11 +1963,13 @@ + Printf(f_shadow, modern ? "(object)" : "(_object)"); + } + } + Printf(f_shadow,":\n"); +- if ( have_docstring(n) ) +- Printv(f_shadow, tab4, docstring(n, AUTODOC_CLASS, tab4), "\n", NIL); +- ++ if ( have_docstring(n) ) { ++ String* str = docstring(n, AUTODOC_CLASS, tab4); ++ if (str != NULL && Len(str)) ++ Printv(f_shadow, tab4, str, "\n", NIL); ++ } + if (!modern) { + 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); +@@ -2139,11 +2154,11 @@ + Replaceall(pycode,"$action", pyaction); + Delete(pyaction); + Printv(f_shadow,pycode,"\n",NIL); + } else { +- Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "): ", NIL); ++ Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):", NIL); + if (!have_addtofunc(n)) { +- Printv(f_shadow, "return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL); ++ Printv(f_shadow, " return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL); + } else { + Printv(f_shadow, "\n", NIL); + if ( have_docstring(n) ) + Printv(f_shadow, tab8, docstring(n, AUTODOC_METHOD, tab8), "\n", NIL); +@@ -2175,12 +2190,9 @@ + return SWIG_OK; + } + + if (shadow) { +- // +- // static + autodoc/prepend/append + def args not working!!!, disable by now +- // +- if (0 && !classic && !Getattr(n,"feature:python:callback") && have_addtofunc(n)) { ++ if ( !classic && !Getattr(n,"feature:python:callback") && have_addtofunc(n)) { + int kw = (check_kwargs(n) && !Getattr(n,"sym:overloaded")) ? 1 : 0; + Printv(f_shadow, tab4, "def ", symname, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL); + if ( have_docstring(n) ) + Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL); +Index: Source/Swig/cwrap.c +=================================================================== +RCS file: /cvsroot/swig/SWIG/Source/Swig/cwrap.c,v +retrieving revision 1.51 +diff -u -4 -r1.51 cwrap.c +--- Source/Swig/cwrap.c 4 Dec 2004 08:33:02 -0000 1.51 ++++ Source/Swig/cwrap.c 23 Dec 2004 20:14:07 -0000 +@@ -172,17 +172,26 @@ + tycode = SwigType_type(type); + if (tycode == T_REFERENCE) { + if (pvalue) { + SwigType *tvalue; +- String *defname, *defvalue, *rvalue; ++ String *defname, *defvalue, *rvalue, *qvalue; + rvalue = SwigType_typedef_resolve_all(pvalue); ++ qvalue = SwigType_typedef_qualified(rvalue); + defname = NewStringf("%s_defvalue", lname); + tvalue = Copy(type); + SwigType_del_reference(tvalue); +- defvalue = NewStringf("%s = %s", SwigType_lstr(tvalue,defname), rvalue); ++ tycode = SwigType_type(tvalue); ++ if (tycode != T_USER) { ++ /* plain primitive type, we copy the the def value */ ++ defvalue = NewStringf("%s = %s", SwigType_lstr(tvalue,defname),qvalue); ++ } else { ++ /* user type, we copy the reference value */ ++ defvalue = NewStringf("%s = %s",SwigType_str(type,defname),qvalue); ++ } + Wrapper_add_localv(w,defname, defvalue, NIL); + Delete(tvalue); + Delete(rvalue); ++ Delete(qvalue); + Delete(defname); + Delete(defvalue); + } + } else if (!pvalue && ((tycode == T_POINTER) || (tycode == T_STRING))) { diff --git a/wxPython/SWIG/swig.python-2.patch b/wxPython/SWIG/swig.python-2.patch deleted file mode 100644 index 5ff6aacaef..0000000000 --- a/wxPython/SWIG/swig.python-2.patch +++ /dev/null @@ -1,891 +0,0 @@ -Index: Doc/Manual/Python.html -=================================================================== -RCS file: /cvsroot/swig/SWIG/Doc/Manual/Python.html,v -retrieving revision 1.18 -diff -u -4 -r1.18 Python.html ---- Doc/Manual/Python.html 2 Sep 2004 20:27:14 -0000 1.18 -+++ Doc/Manual/Python.html 23 Sep 2004 00:31:44 -0000 -@@ -86,8 +86,15 @@ -
  • Mapping Python tuples into small arrays -
  • Mapping sequences to C arrays -
  • Pointer handling - -+
  • Docstring Features -+ -+
  • Python Packages - - - - -@@ -2460,9 +2467,8 @@ - customization features as covered in later sections. - -

    26.6.2 Adding additional Python code

    - -- - If writing support code in C isn't enough, it is also possible to write code in - Python. This code gets inserted in to the .py file created by SWIG. One - use of Python code might be to supply a high-level interface to certain functions. - For example: -@@ -2506,8 +2512,46 @@ - soon enough. For now, think of this example as an illustration of - what can be done without having to rely on any of the more advanced - customization features. - -+

    Sometimes you may want to replace or modify the wrapper function -+that SWIG creates in the proxy .py file. The Python module -+in SWIG provides some features that enable you do do this. First, to -+entirely replace a proxy function you can use -+%feature("shadow"). For example: -+ -+

    -+
    -+%module example
-+%rename(bar_id) bar(int,double);
-+
-+// Rewrite bar() to allow some nice overloading
-+
-+%feature("shadow") Foo::bar(int) %{
-+def bar(*args):
-+    if len(args) == 3:
-+         return apply(examplec.Foo_bar_id,args)
-+    return apply(examplec.Foo_bar,args)
-+%}
-+    
-+class Foo {
-+public:
-+    int bar(int x);
-+    int bar(int x, double y);
-+}
-+
    -+
    -+ -+ -+Often the proxy function created by SWIG is fine, but you simply want -+to add code to it without touching the rest of the generated function -+body. For these cases SWIG provides the "pythonprepend" and -+"pythonappend" features which do exactly as their names suggest. The -+"pythonprepend" feature will insert its value at the begining of the -+proxy function, and "pythonappend" will insert code at the end of the -+proxy, just before the return statement. -+ -+ -

    26.6.3 Class extension with %extend

    - - - One of the more interesting features of SWIG is that it can extend -@@ -3852,6 +3896,197 @@ - that has a this attribute. In addition, - SWIG_NewPointerObj() can automatically generate a proxy - class object (if applicable). - -+ -+ -+

    26.10 Docstring Features

    -+ -+Usign docstrings in Python code is becoming more and more important -+ans more tools are coming on the scene that take advantage of them, -+everything from full-blown documentaiton generators to class browsers -+and popup call-tips in Python-aware IDEs. Given the way that SWIG -+generates the proxy code by default, your users will normally get -+something like "function_name(*args)" in the popup calltip of -+their IDE which is next to useless when the real function prototype -+might be something like this: -+ -+
    -+
    -+bool function_name(int x, int y, Foo* foo=NULL, Bar* bar=NULL);
-+
    -+
    -+ -+The features described in this section make it easy for you to add -+docstrings to your modules, functions and methods that can then be -+used by the various tools out there to make the programming experience -+of your users much simpler. -+ -+ -+

    26.10.1 Module docstring

    -+ -+Python allows a docstring at the begining of the .py file -+before any other statements, and it is typically used to give a -+general description of the entire module. SWIG supports this by -+setting an option of the %module directive. For example: -+ -+
    -+
    -+%module(docstring="This is the example module's docstring") example
-+
    -+
    -+ -+When you have more than just a line or so then you can retain the easy -+readability of the %module directive by using a macro. For -+example: -+ -+
    -+
    -+%define DOCSTRING
-+"The `XmlResource` class allows program resources defining menus, 
-+layout of controls on a panel, etc. to be loaded from an XML file."
-+%enddef
-+
-+%module(docstring=DOCSTRING) xrc
-+
    -+
    -+ -+ -+

    26.10.2 %feature("autodoc")

    -+ -+As alluded to above SWIG will generate all the function and method -+proxy wrappers with just "*args" (or "*args, **kwargs" if the -keyword -+option is used) for a parameter list and will then sort out the -+individual parameters in the C wrapper code. This is nice and simple -+for the wrapper code, but makes it difficult to be programmer and tool -+friendly as anyone looking at the .py file will not be able -+to find out anything about the parameters that the fuctions accept. -+ -+

    But since SWIG does know everything about the fucntion it is -+possible to generate a docstring containing the parameter types, names -+and default values. Since many of the doctring tools are adopting a -+standard of recognizing if the first thing in the docstring is a -+function prototype then using that instead of what they found from -+introspeciton, then life is good once more. -+ -+

    SWIG's Python module provides support for the "autodoc" feature, -+which when attached to a node in the parse tree will cause a docstring -+to be generated that includes the name of the funciton, parameter -+names, default values if any, and return type if any. There are also -+three options for autodoc controlled by the value given to the -+feature, described below. -+ -+

    %feature("autodoc", "0")

    -+ -+When the "0" option is given then the types of the parameters will -+not be included in the autodoc string. For example, given -+this function prototype: -+ -+
    -+
    -+%feature("autodoc", "0");
-+bool function_name(int x, int y, Foo* foo=NULL, Bar* bar=NULL);
-+
    -+
    -+ -+Then Python code like this will be generated: -+ -+
    -+
    -+def function_name(*args, **kwargs):
-+    """function_name(x, y, foo=None, bar=None) -> bool"""
-+    ...
-+
    -+
    -+ -+ -+

    %feature("autodoc", "1")

    -+ -+When the "1" option is used then the parameter types will be -+used in the autodoc string. In addition, an atempt is made to -+simplify the type name such that it makes more sense to the Python -+user. Pointer, reference and const info is removed, -+%rename's are evaluated, etc. (This is not always -+successful, but works most of the time. See the next section for what -+to do when it doesn't.) Given the example above, then turning on the -+parameter types with the "1" option will result in Python code like -+this: -+ -+
    -+
    -+def function_name(*args, **kwargs):
-+    """function_name(int x, int y, Foo foo=None, Bar bar=None) -> bool"""
-+    ...
-+
    -+
    -+ -+ -+ -+

    %feature("autodoc", "docstring")

    -+ -+Finally, there are times when the automatically generated autodoc -+string will make no sense for a Python programmer, particularly when a -+typemap is involved. So if you give an explicit value for the autodoc -+feature then that string will be used in place of the automatically -+generated string. For example: -+ -+
    -+
    -+%feature("autodoc", "GetPosition() -> (x, y)") GetPosition;
-+void GetPosition(int* OUTPUT, int* OUTPUT);
-+
    -+
    -+ -+ -+

    26.10.3 %feature("docstring")

    -+ -+In addition to the autodoc strings described above, you can also -+attach any arbitrary descriptive text to a node in the parse tree with -+the "docstring" feature. When the proxy module is generated then any -+docstring associated with classes, function or methods are output. -+If an item already has an autodoc string then it is combined with the -+docstring and they are output together. If the docstring is all on a -+single line then it is output like this:: -+ -+
    -+
    -+"""This is the docstring"""
-+
    -+
    -+ -+Otherwise, to aid readability it is output like this: -+ -+
    -+
    -+"""
-+This is a multi-line docstring
-+with more than one line.
-+"""
-+
    -+
    -+ -+

    26.11 Python Packages

    -+ -+Using the package option of the %module directive -+allows you to specify what Python package that the module will be -+living in when installed. -+ -+
    -+
    -+%module(package="wx") xrc
-+
    -+
    -+ -+This is useful when the .i file is %imported by -+another .i file. By default SWIG will assume that the -+importer is able to find the importee with just the module name, but -+if they live in separate Python packages then that won't work. -+However if the importee specifies what its package is with the -+%module option then the Python code generated for the -+importer will use that package name when importing the other module -+and also in base class declarations, etc. if the pacakge name is -+different than its own. -+ -+ -+ - - -Index: Source/Modules/python.cxx -=================================================================== -RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v -retrieving revision 1.50 -diff -u -4 -r1.50 python.cxx ---- Source/Modules/python.cxx 1 Sep 2004 22:25:56 -0000 1.50 -+++ Source/Modules/python.cxx 23 Sep 2004 00:31:44 -0000 -@@ -19,8 +19,9 @@ - - static String *const_code = 0; - static String *shadow_methods = 0; - static String *module = 0; -+static String *package = 0; - static String *mainmodule = 0; - static String *interface = 0; - static String *global_name = 0; - static int shadow = 1; -@@ -50,8 +51,18 @@ - static int have_constructor; - static int have_repr; - static String *real_classname; - -+/* flags for the make_autodoc function */ -+enum autodoc_t { -+ AUTODOC_CLASS, -+ AUTODOC_CTOR, -+ AUTODOC_DTOR, -+ AUTODOC_STATICFUNC, -+ AUTODOC_FUNC, -+ AUTODOC_METHOD -+}; -+ - static const char *usage = (char *)"\ - Python Options (available with -python)\n\ - -globals - Set used to access C global variable [default: 'cvar']\n\ - -interface - Set the lib name to \n\ -@@ -145,19 +156,22 @@ - * - * use %module(directors="1") modulename at the start of the - * interface file to enable director generation. - */ -+ String* mod_docstring = NULL; - { -- Node *module = Getattr(n, "module"); -- if (module) { -- Node *options = Getattr(module, "options"); -+ Node *mod = Getattr(n, "module"); -+ if (mod) { -+ Node *options = Getattr(mod, "options"); - if (options) { - if (Getattr(options, "directors")) { - allow_directors(); - } - if (Getattr(options, "dirprot")) { - allow_dirprot(); - } -+ mod_docstring = Getattr(options, "docstring"); -+ package = Getattr(options, "package"); - } - } - } - -@@ -257,8 +271,13 @@ - Printv(f_shadow, - "# This file is compatible with both classic and new-style classes.\n", - NIL); - } -+ -+ if (mod_docstring && Len(mod_docstring)) { -+ Printv(f_shadow, "\n\"\"\"\n", mod_docstring, "\n\"\"\"\n", NIL); -+ Delete(mod_docstring); mod_docstring = NULL; -+ } - - Printf(f_shadow,"\nimport %s\n\n", module); - - if (! modern) { -@@ -381,9 +400,28 @@ - virtual int importDirective(Node *n) { - if (shadow) { - String *modname = Getattr(n,"module"); - if (modname) { -- Printf(f_shadow,"import %s\n", modname); -+ Printf(f_shadow,"import "); -+ -+ // Find the module node for this imported module. It should be the -+ // first child but search just in case. -+ Node* mod = firstChild(n); -+ while (mod && Strcmp(nodeType(mod), "module") != 0) -+ mod = nextSibling(mod); -+ -+ // Is the imported module in another package? (IOW, does it use the -+ // %module(package="name") option and it's different than the package -+ // of this module.) -+ Node *options = Getattr(mod, "options"); -+ if (options && Getattr(options, "package")) { -+ String* pkg = Getattr(options, "package"); -+ if (!package || Strcmp(pkg, package) != 0) -+ Printf(f_shadow, "%s.", Getattr(options, "package")); -+ } -+ -+ // finally, output the name of the imported module -+ Printf(f_shadow, "%s\n", modname); - } - } - return Language::importDirective(n); - } -@@ -416,17 +454,25 @@ - * functions. - * ------------------------------------------------------------ */ - - void emitFunctionShadowHelper(Node *n, File *f_dest, String *name, int kw) { -- if ( ! have_addtofunc(n) ) { -- /* If there is no addtofunc directive then just assign from the extension module */ -+ if ( !have_pythonprepend(n) && !have_pythonappend(n) && !have_docstring(n) ) { -+ /* If there is no pythonappend or docstring directive then just assign from the extension module */ - Printv(f_dest, "\n", name, " = ", module, ".", name, "\n", NIL); - } else { - /* Otherwise make a wrapper function to insert the code into */ - Printv(f_dest, "\ndef ", name, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL); -- Printv(f_dest, tab4, "val = ", funcCallHelper(name, kw), "\n", NIL); -- Printv(f_dest, tab4, addtofunc(n), "\n", NIL); -- Printv(f_dest, tab4, "return val\n", NIL); -+ if ( have_docstring(n) ) -+ Printv(f_dest, tab4, docstring(n, AUTODOC_FUNC, tab4), "\n", NIL); -+ if ( have_pythonprepend(n) ) -+ Printv(f_dest, tab4, pythonprepend(n), "\n", NIL); -+ if ( have_pythonappend(n) ) { -+ Printv(f_dest, tab4, "val = ", funcCallHelper(name, kw), "\n", NIL); -+ Printv(f_dest, tab4, pythonappend(n), "\n", NIL); -+ Printv(f_dest, tab4, "return val\n", NIL); -+ } else { -+ Printv(f_dest, tab4, "return ", funcCallHelper(name, kw), "\n", NIL); -+ } - } - } - - -@@ -440,24 +486,307 @@ - } - - - /* ------------------------------------------------------------ -- * have_addtofunc() -- * Check if there is a %addtofunc directive and it has text -+ * have_docstring() -+ * Check if there is a docstring directive and it has text, -+ * or there is an autodoc flag set - * ------------------------------------------------------------ */ - -- bool have_addtofunc(Node *n) { -- String* str = Getattr(n, "feature:addtofunc"); -+ bool have_docstring(Node *n) { -+ String* str = Getattr(n, "feature:docstring"); -+ return (str != NULL && Len(str) > 0) || -+ (Getattr(n,"feature:autodoc") && !Getattr(n, "feature:noautodoc")); -+ } -+ -+ /* ------------------------------------------------------------ -+ * docstring() -+ * Get the docstring text, stripping off {} if neccessary, -+ * and enclose in triple double quotes. If autodoc is also -+ * set then it will build a combined docstring. -+ * ------------------------------------------------------------ */ -+ -+ String *docstring(Node *n, autodoc_t ad_type, const String* indent) { -+ String* str = Getattr(n, "feature:docstring"); -+ bool have_ds = (str != NULL && Len(str) > 0); -+ bool have_auto = (Getattr(n,"feature:autodoc") && !Getattr(n, "feature:noautodoc")); -+ char* triple_double = "\"\"\""; -+ String* autodoc = NULL; -+ String* doc = NULL; -+ -+ if ( have_ds ) { -+ char* t = Char(str); -+ if (*t == '{') { -+ Delitem(str ,0); -+ Delitem(str,DOH_END); -+ } -+ } -+ -+ if ( have_auto ) { -+ autodoc = make_autodoc(n, ad_type); -+ have_auto = (autodoc != NULL && Len(autodoc) > 0); -+ } -+ -+ // If there is more than one line then make docstrings like this: -+ // -+ // """ -+ // This is line1 -+ // And here is line2 followed by the rest of them -+ // """ -+ // -+ // otherwise, put it all on a single line -+ // -+ if ( have_auto && have_ds ) { // Both autodoc and docstring are present -+ doc = NewString(""); -+ Printv(doc, triple_double, "\n", -+ pythoncode(autodoc, indent), "\n", -+ pythoncode(str, indent), -+ indent, triple_double, NIL); -+ } -+ else if ( !have_auto && have_ds ) { // only docstring -+ if (Strchr(str, '\n') == NULL) { -+ doc = NewStringf("%s%s%s", triple_double, str, triple_double); -+ } -+ else { -+ doc = NewString(""); -+ Printv(doc, triple_double, "\n", -+ pythoncode(str, indent), -+ indent, triple_double, NIL); -+ } -+ } -+ else if ( have_auto && !have_ds ) { // only autodoc -+ if (Strchr(autodoc, '\n') == NULL) { -+ doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double); -+ } -+ else { -+ doc = NewString(""); -+ Printv(doc, triple_double, "\n", -+ pythoncode(autodoc, indent), -+ indent, triple_double, NIL); -+ } -+ } -+ else -+ doc = NewString(""); -+ -+ // Save the generated strings in the parse tree in case they are used later -+ // by post processing tools -+ Setattr(n, "python:docstring", doc); -+ Setattr(n, "python:autodoc", autodoc); -+ return doc; -+ } -+ -+ -+ /* ------------------------------------------------------------ -+ * make_autodoc() -+ * Build a docstring for the node, using parameter and other -+ * info in the parse tree. If the value of the autodoc -+ * attribute is "0" then do not include parameter types, if -+ * it is "1" (the default) then do. If it has some other -+ * value then assume it is supplied by the extension writer -+ * and use it directly. -+ * ------------------------------------------------------------ */ -+ -+ String* make_autodoc(Node *n, autodoc_t ad_type) { -+ -+ if (ad_type == AUTODOC_CLASS) -+ return NULL; // No function call to document in this case -+ -+ // If the function is overloaded then this funciton is called -+ // for the last one. Rewind to the first so the docstrings are -+ // in order. -+ while ( Getattr(n, "sym:previousSibling") ) -+ n = Getattr(n, "sym:previousSibling"); -+ -+ String* doc = NewString(""); -+ while (n) { -+ bool showTypes = false; -+ bool skipAuto = false; -+ -+ // check how should the parameters be rendered? -+ String* autodoc = Getattr(n, "feature:autodoc"); -+ if (Strcmp(autodoc, "0") == 0) -+ showTypes = false; -+ else if (Strcmp(autodoc, "1") == 0) -+ showTypes = true; -+ else { -+ // if not "0" or "1" then autodoc is already the string that should be used -+ Printf(doc, "%s", autodoc); -+ skipAuto = true; -+ } -+ -+ if (!skipAuto) { -+ String* symname = Getattr(n, "sym:name"); -+ SwigType* type = Getattr(n, "type"); -+ -+ if (type) { -+ if (Strcmp(type, "void") == 0) -+ type = NULL; -+ else { -+ SwigType* qt = SwigType_typedef_resolve_all(type); -+ if (SwigType_isenum(qt)) -+ type = NewString("int"); -+ else { -+ type = SwigType_base(type); -+ Node* lookup = Swig_symbol_clookup(type, 0); -+ if (lookup) -+ type = Getattr(lookup, "sym:name"); -+ } -+ } -+ } -+ -+ switch ( ad_type ) { -+ case AUTODOC_CTOR: -+ if ( Strcmp(class_name, symname) == 0) { -+ String* paramList = make_autodocParmList(n, showTypes); -+ if (Len(paramList)) -+ Printf(doc, "__init__(self, %s) -> %s", paramList, class_name); -+ else -+ Printf(doc, "__init__(self) -> %s", class_name); -+ } -+ else -+ Printf(doc, "%s(%s) -> %s", symname, make_autodocParmList(n, showTypes), class_name); -+ break; -+ -+ case AUTODOC_DTOR: -+ Printf(doc, "__del__(self)"); -+ break; -+ -+ case AUTODOC_STATICFUNC: -+ Printf(doc, "%s(%s)", symname, make_autodocParmList(n, showTypes)); -+ if (type) Printf(doc, " -> %s", type); -+ break; -+ -+ case AUTODOC_FUNC: -+ Printf(doc, "%s(%s)", symname, make_autodocParmList(n, showTypes)); -+ if (type) Printf(doc, " -> %s", type); -+ break; -+ -+ case AUTODOC_METHOD: -+ String* paramList = make_autodocParmList(n, showTypes); -+ if (Len(paramList)) -+ Printf(doc, "%s(self, %s)", symname, paramList); -+ else -+ Printf(doc, "%s(self)", symname); -+ if (type) Printf(doc, " -> %s", type); -+ break; -+ } -+ } -+ -+ // if it's overloaded then get the next decl and loop around again -+ n = Getattr(n, "sym:nextSibling"); -+ if (n) -+ Printf(doc, "\n"); -+ } -+ -+ return doc; -+ } -+ -+ -+ String* make_autodocParmList(Node* n, bool showTypes) { -+ String* doc = NewString(""); -+ ParmList* plist = Getattr(n,"parms"); -+ Parm* p; -+ Node* lookup; -+ int lines = 0; -+ const int maxwidth = 50; -+ -+ -+ for (p = plist; p; p = nextSibling(p)) { -+ String* name = Getattr(p, "name"); -+ String* value = Getattr(p, "value"); -+ -+ if ( Len(doc) ) { -+ // add a comma to the previous one if any -+ Printf(doc, ", "); -+ -+ // Do we need to wrap a long line? -+ if ((Len(doc) - lines*maxwidth) > maxwidth) { -+ Printf(doc, "\n%s", tab4); -+ lines += 1; -+ } -+ } -+ -+ // Do the param type too? -+ if (showTypes) { -+ SwigType* type = SwigType_base(Getattr(p, "type")); -+ SwigType* qt = SwigType_typedef_resolve_all(type); -+ if (SwigType_isenum(qt)) -+ type = NewString("int"); -+ else { -+ lookup = Swig_symbol_clookup(type, 0); -+ if (lookup) -+ type = Getattr(lookup, "sym:name"); -+ } -+ Printf(doc, "%s ", type); -+ } -+ -+ if (name) -+ Printf(doc, "%s", name); -+ else -+ Printf(doc, "??"); -+ -+ if (value) { -+ if (Strcmp(value, "NULL") == 0) -+ value = NewString("None"); -+ else if (Strcmp(value, "true") == 0 || Strcmp(value, "TRUE") == 0) -+ value = NewString("True"); -+ else if (Strcmp(value, "false") == 0 || Strcmp(value, "FALSE") == 0) -+ value = NewString("False"); -+ else { -+ lookup = Swig_symbol_clookup(value, 0); -+ if (lookup) -+ value = Getattr(lookup, "sym:name"); -+ } -+ Printf(doc, "=%s", value); -+ } -+ } -+ -+ return doc; -+ } -+ -+ -+ /* ------------------------------------------------------------ -+ * have_pythonprepend() -+ * Check if there is a %pythonprepend directive and it has text -+ * ------------------------------------------------------------ */ -+ -+ bool have_pythonprepend(Node *n) { -+ String* str = Getattr(n, "feature:pythonprepend"); -+ return (str != NULL && Len(str) > 0); -+ } -+ -+ /* ------------------------------------------------------------ -+ * pythonprepend() -+ * Get the %pythonprepend code, stripping off {} if neccessary -+ * ------------------------------------------------------------ */ -+ -+ String *pythonprepend(Node *n) { -+ String* str = Getattr(n, "feature:pythonprepend"); -+ char* t = Char(str); -+ if (*t == '{') { -+ Delitem(str ,0); -+ Delitem(str,DOH_END); -+ } -+ return str; -+ } -+ -+ /* ------------------------------------------------------------ -+ * have_pythonappend() -+ * Check if there is a %pythonappend directive and it has text -+ * ------------------------------------------------------------ */ -+ -+ bool have_pythonappend(Node *n) { -+ String* str = Getattr(n, "feature:pythonappend"); - return (str != NULL && Len(str) > 0); - } - - /* ------------------------------------------------------------ -- * addtofunc() -- * Get the %addtofunc code, stripping off {} if neccessary -+ * pythonappend() -+ * Get the %pythonappend code, stripping off {} if neccessary - * ------------------------------------------------------------ */ - -- String *addtofunc(Node *n) { -- String* str = Getattr(n, "feature:addtofunc"); -+ String *pythonappend(Node *n) { -+ String* str = Getattr(n, "feature:pythonappend"); - char* t = Char(str); - if (*t == '{') { - Delitem(str ,0); - Delitem(str,DOH_END); -@@ -1686,9 +2015,18 @@ - mod = Getattr(n,"module"); - if (mod) { - String *modname = Getattr(mod,"name"); - if (Strcmp(modname,mainmodule) != 0) { -- importname = NewStringf("%s.%s", modname, Getattr(n,"sym:name")); -+ // check if the module has a package option -+ String* pkg = NULL; -+ Node *options = Getattr(mod, "options"); -+ if (options && Getattr(options, "package")) -+ pkg = Getattr(options, "package"); -+ -+ if (!package || Strcmp(pkg, package) != 0) -+ importname = NewStringf("%s.%s.%s", pkg, modname, Getattr(n,"sym:name")); -+ else -+ importname = NewStringf("%s.%s", modname, Getattr(n,"sym:name")); - } else { - importname = NewString(Getattr(n,"sym:name")); - } - Setattr(n,"python:proxy",importname); -@@ -1760,9 +2098,11 @@ - Printf(f_shadow, modern ? "(object)" : "(_object)"); - } - } - Printf(f_shadow,":\n"); -- -+ if ( Getattr(n, "feature:docstring") ) // don't use have_docstring in this case because autodoc doesn't apply -+ Printv(f_shadow, tab4, docstring(n, AUTODOC_CLASS, tab4), "\n", NIL); -+ - if (!modern) { - 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); -@@ -1906,16 +2246,24 @@ - Delete(pyaction); - Printv(f_shadow,pycode,"\n",NIL); - } else { - -- Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "): ", NIL); -- if ( have_addtofunc(n) ) { -- Printv(f_shadow, "\n", NIL); -- Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL); -- Printv(f_shadow, tab8, addtofunc(n), "\n", NIL); -- Printv(f_shadow, tab8, "return val\n", NIL); -+ Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):", NIL); -+ if ( !have_pythonprepend(n) && !have_pythonappend(n) && !have_docstring(n)) { -+ Printv(f_shadow, " return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL); - } else { -- Printv(f_shadow, "return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL); -+ Printv(f_shadow, "\n", NIL); -+ if ( have_docstring(n) ) -+ Printv(f_shadow, tab8, docstring(n, AUTODOC_METHOD, tab8), "\n", NIL); -+ if ( have_pythonprepend(n) ) -+ Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); -+ if ( have_pythonappend(n) ) { -+ Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL); -+ Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); -+ Printv(f_shadow, tab8, "return val\n\n", NIL); -+ } else { -+ Printv(f_shadow, tab8, "return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n\n", NIL); -+ } - } - } - - } -@@ -1930,14 +2278,22 @@ - virtual int staticmemberfunctionHandler(Node *n) { - String *symname = Getattr(n,"sym:name"); - Language::staticmemberfunctionHandler(n); - if (shadow) { -- if ( !classic && have_addtofunc(n) ) { -+ if ( !classic && (have_pythonprepend(n) || have_pythonappend(n) || have_docstring(n)) ) { - int kw = (check_kwargs(n) && !Getattr(n,"sym:overloaded")) ? 1 : 0; - Printv(f_shadow, tab4, "def ", symname, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL); -- Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n", NIL); -- Printv(f_shadow, tab8, addtofunc(n), "\n", NIL); -- Printv(f_shadow, tab8, "return val\n", NIL); -+ if ( have_docstring(n) ) -+ Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL); -+ if ( have_pythonprepend(n) ) -+ Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); -+ if ( have_pythonappend(n) ) { -+ Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n", NIL); -+ Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); -+ Printv(f_shadow, tab8, "return val\n\n", NIL); -+ } else { -+ Printv(f_shadow, tab8, "return ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n\n", NIL); -+ } - Printv(f_shadow, tab4, modern ? "" : "if _newclass:", symname, - " = staticmethod(", symname, ")\n", NIL); - - if (!modern) { -@@ -2022,8 +2378,12 @@ - } - - Printv(f_shadow, tab4, "def __init__(self, *args", - (allow_kwargs ? ", **kwargs" : ""), "):\n", NIL); -+ if ( have_docstring(n) ) -+ Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL); -+ if ( have_pythonprepend(n) ) -+ Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); - Printv(f_shadow, pass_self, NIL); - if (!modern) { - Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', ", - funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL); -@@ -2036,10 +2396,10 @@ - Printv(f_shadow, tab8, "self.this = newobj.this\n", NIL); - Printv(f_shadow, tab8, "self.thisown = 1\n", NIL); - Printv(f_shadow, tab8, "del newobj.thisown\n", NIL); - } -- if ( have_addtofunc(n) ) -- Printv(f_shadow, tab8, addtofunc(n), "\n", NIL); -+ if ( have_pythonappend(n) ) -+ Printv(f_shadow, tab8, pythonappend(n), "\n\n", NIL); - Delete(pass_self); - } - have_constructor = 1; - } else { -@@ -2055,13 +2415,17 @@ - } else { - - Printv(f_shadow_stubs, "\ndef ", symname, "(*args", - (allow_kwargs ? ", **kwargs" : ""), "):\n", NIL); -+ if ( have_docstring(n) ) -+ Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL); -+ if ( have_pythonprepend(n) ) -+ Printv(f_shadow_stubs, tab4, pythonprepend(n), "\n", NIL); - Printv(f_shadow_stubs, tab4, "val = ", - funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL); - Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL); -- if ( have_addtofunc(n) ) -- Printv(f_shadow_stubs, tab4, addtofunc(n), "\n", NIL); -+ if ( have_pythonappend(n) ) -+ Printv(f_shadow_stubs, tab4, pythonappend(n), "\n", NIL); - Printv(f_shadow_stubs, tab4, "return val\n", NIL); - } - } - } -@@ -2088,13 +2452,18 @@ - Delete(pyaction); - Printv(f_shadow,pycode,"\n", NIL); - } else { - Printv(f_shadow, tab4, "def __del__(self, destroy=", module, ".", Swig_name_destroy(symname), "):\n", NIL); -- if ( have_addtofunc(n) ) -- Printv(f_shadow, tab8, addtofunc(n), "\n", NIL); -+ if ( have_docstring(n) ) -+ Printv(f_shadow, tab8, docstring(n, AUTODOC_DTOR, tab8), "\n", NIL); -+ if ( have_pythonprepend(n) ) -+ Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); - Printv(f_shadow, tab8, "try:\n", NIL); -- Printv(f_shadow, tab4, tab8, "if self.thisown: destroy(self)\n", NIL); -+ Printv(f_shadow, tab8, tab4, "if self.thisown: destroy(self)\n", NIL); - Printv(f_shadow, tab8, "except: pass\n", NIL); -+ if ( have_pythonappend(n) ) -+ Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); -+ Printv(f_shadow, "\n", NIL); - } - } - return SWIG_OK; - } diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index 62f5b95116..b24f4c5a22 100644 --- a/wxPython/docs/CHANGES.txt +++ b/wxPython/docs/CHANGES.txt @@ -5,7 +5,7 @@ Recent Changes for wxPython 2.5.3.3 ------- -wx.Sizer Add, Insert, and Prepend funcitons now return a reference to the +wx.Sizer Add, Insert, and Prepend functions now return a reference to the wx.SizerItem that was added to the sizer, and the wx.SizerItem has a GetRect accessor to give the position of the item on the parent window. @@ -30,7 +30,6 @@ Added wx.PasswordEntryDialog analagous to wx.TextEntryDialog, allows detecting entering an empty string vs. cancel unlike the wx.GetPasswordFromUser dialog function. - OGL patch from Shane Holloway: Two simple problems found in the new python ogl code. First is @@ -53,7 +52,7 @@ OGL patch from Shane Holloway: Fixed GetSaveData and SetSaveData in wx.lib.multisash to not depend on the default way that class objectss are converted to strings. -Fixed problem in StyledTextCtrl.Set[H|V]ScrollBar that could leave the +Fixed problem in StyledTextCtrl.Set[HV]ScrollBar that could leave the internal scrollbar visible. Added wx.StandardPaths which provides methods for determining standard @@ -73,7 +72,9 @@ wxGTK2: Reimplemented DoDrawRotatedText() by way of a rotation of an alpha blended text bitmap. It would be better if Pango could draw directly into an wxImage (as FreeType can,) but that is for later... -Added wrappers and a demo for wx.MediaCtrl. +Added wrappers and a demo for the wx.MediaCtrl class, which can play +various forms of audio/video media using native codecs install on the +system. So far it is only implemented for Windows and OSX. wxGTK: Patch applied for Freeze()/Thaw() for wxTextCtrtl. @@ -104,6 +105,35 @@ your timers it will no longer work. Instead you should hold a reference to the timer and then del the reference when you are finished with the timer. +Updated to 1.3.24 of SWIG. All of my big patches have been applied to +the main SWIG source tree, but unfortunatly there were also some bugs +added that affected the wxPython build and a few details in my +original patch were changed/removed, so we are still not free of +patches. A new patch for SWIG is located in the wxPython/SWIG +directory of the wxPython source tree. SWIG 1.3.24 plus this patch +should be used by anyone who is making custom modifications to +wxPython's *.i files, or building their own extension modules or +etc. that need to interact with the wxPython swigged types. For the +morbidly curious, here are a few more details: + + * Since it is now possible easily and simply share the SWIG type + tables across modules I reverted to always using the stock SWIG + runtime instead of my slightly hacked up version of it exported + via the wxPython C API. + + * The %name directive is now deprecated so replaced most uses of + it with a custom %Rename macro that uses %rename internally. + These will evetually need to be replaced with a DocDecl macro + when docstrings are added. + + * The "this" attribute of all SWIGged classes is no longer a + string containing a "swigified pointer", but rather a custom + built-in type that holds the real C pointer to the object and + the type info. It can be converted to a string like the old + value using str() or to the long integer value of the pointer + using long(). + + -- 2.47.2