Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back

Browse Source 
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@31128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-23 20:44:09 +00:00
parent 47261ba05f
commit 1b8c7ba607
76 changed files with 482 additions and 1650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
wxPython/src/_defs.i
View File

@@ -82,14 +82,16 @@ typedef unsigned long wxUIntPtr;
%define MAKE_CONST_WXSTRING(strname)
%{ static const wxString wxPy##strname(wx##strname); %}
%immutable;
%name(strname) const wxString wxPy##strname;
%rename(strname) wxPy##strname;
const wxString wxPy##strname;
%mutable;
%enddef
%define MAKE_CONST_WXSTRING2(strname, val)
%{ static const wxString wxPy##strname(val); %}
%immutable;
%name(strname) const wxString wxPy##strname;
%rename(strname) wxPy##strname;
const wxString wxPy##strname;
%mutable;
%enddef
@@ -163,12 +165,14 @@ typedef unsigned long wxUIntPtr;
#ifdef _DO_FULL_DOCS
%define DocDeclStrName(type, decl, docstr, details, newname)
%feature("docstring") decl docstr details;
%name(newname) type decl
%rename(newname) decl;
type decl
%enddef
#else
%define DocDeclStrName(type, decl, docstr, details, newname)
%feature("docstring") decl docstr;
%name(newname) type decl
%rename(newname) decl;
type decl
%enddef
#endif
@@ -183,7 +187,8 @@ typedef unsigned long wxUIntPtr;
// As above, but also give the decl a new %name
%define DocDeclAName(type, decl, astr, newname)
%feature("autodoc") decl astr;
%name(newname) type decl
%rename(newname) decl;
type decl
%enddef
@@ -210,13 +215,15 @@ typedef unsigned long wxUIntPtr;
%define DocDeclAStrName(type, decl, astr, docstr, details, newname)
%feature("autodoc") decl astr;
%feature("docstring") decl docstr details;
%name(newname) type decl
%rename(newname) decl;
type decl
%enddef
#else
%define DocDeclAStrName(type, decl, astr, docstr, details, newname)
%feature("autodoc") decl astr;
%feature("docstring") decl docstr;
%name(newname) type decl
%rename(newname) decl;
type decl
%enddef
#endif
@@ -241,12 +248,14 @@ typedef unsigned long wxUIntPtr;
#ifdef _DO_FULL_DOCS
%define DocCtorStrName(decl, docstr, details, newname)
%feature("docstring") decl docstr details;
%name(newname) decl
%rename(newname) decl;
decl
%enddef
#else
%define DocCtorStrName(decl, docstr, details, newname)
%feature("docstring") decl docstr;
%name(newname) decl
%rename(newname) decl;
decl
%enddef
#endif
@@ -262,7 +271,8 @@ typedef unsigned long wxUIntPtr;
// As above, but also give the decl a new %name
%define DocCtorAName(decl, astr, newname)
%feature("autodoc") decl astr;
%name(newname) decl
%rename(newname) decl;
decl
%enddef
@@ -290,13 +300,15 @@ typedef unsigned long wxUIntPtr;
%define DocCtorAStrName(decl, astr, docstr, details, newname)
%feature("autodoc") decl astr;
%feature("docstring") decl docstr details;
%name(newname) decl
%rename(newname) decl;
decl
%enddef
#else
%define DocCtorAStrName(decl, astr, docstr, details, newname)
%feature("autodoc") decl astr;
%feature("docstring") decl docstr;
%name(newname) decl
%rename(newname) decl;
decl
%enddef
#endif
@@ -308,6 +320,20 @@ typedef unsigned long wxUIntPtr;
}
%enddef
// A set of macros to make using %rename easier, since %name has been
// deprecated...
%define %Rename(newname, type, decl)
%rename(newname) decl;
type decl
%enddef
%define %RenameCtor(newname, decl)
%rename(newname) decl;
decl
%enddef
//---------------------------------------------------------------------------
// Forward declarations and %renames for some classes, so the autodoc strings
// will be able to use the right types even when the real class declaration is