X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1ed5268269bb2ed46992cb8624b03597de7ba3..f78e4942ec0f3f6abd2992502e2d6c5c2e8e55f6:/wxPython/src/_defs.i?ds=sidebyside diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index 0d30488719..4309bf62b5 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -48,6 +48,7 @@ typedef int wxEventType; typedef unsigned int size_t; typedef unsigned int time_t; typedef unsigned char byte; +typedef unsigned long wxUIntPtr; #define wxWindowID int #define wxCoord int @@ -81,14 +82,16 @@ typedef unsigned char byte; %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 @@ -162,12 +165,14 @@ typedef unsigned char byte; #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 @@ -182,7 +187,8 @@ typedef unsigned char byte; // 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 @@ -209,13 +215,15 @@ typedef unsigned char byte; %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 @@ -240,12 +248,14 @@ typedef unsigned char byte; #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 @@ -261,7 +271,8 @@ typedef unsigned char byte; // 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 @@ -289,13 +300,15 @@ typedef unsigned char byte; %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 @@ -307,6 +320,20 @@ typedef unsigned char byte; } %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 @@ -593,6 +620,8 @@ enum { wxPD_ELAPSED_TIME, wxPD_ESTIMATED_TIME, wxPD_REMAINING_TIME, + wxPD_SMOOTH, + wxPD_CAN_SKIP, wxDD_NEW_DIR_BUTTON, wxDD_DEFAULT_STYLE,