X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08dcfb926641b6eaa8622cd298e5d2a998ed5bc9..1bad23bc76a20a53c3abb0932aa783eebbd22da6:/wxPython/src/_defs.i diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index 5c1f8b0824..46fcd11a0a 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -259,7 +259,6 @@ typedef unsigned long wxUIntPtr; %enddef #endif - // Set the autodoc string for a constructor decl and then define the decl too. // Must use the full declaration of the item. @@ -333,6 +332,19 @@ typedef unsigned long wxUIntPtr; decl %enddef +#ifdef _DO_FULL_DOCS + %define %RenameDocCtor(newname, docstr, details, decl) + %feature("docstring") decl docstr details; + %rename(newname) decl; + decl + %enddef +#else + %define %RenameDocCtor(newname, docstr, details, decl) + %feature("docstring") decl docstr; + %rename(newname) decl; + decl + %enddef +#endif //--------------------------------------------------------------------------- // Forward declarations and %renames for some classes, so the autodoc strings @@ -398,7 +410,9 @@ enum { wxSTATIC_BORDER, wxTRANSPARENT_WINDOW, wxNO_BORDER, - + wxDEFAULT_CONTROL_BORDER, + wxDEFAULT_STATUSBAR_STYLE, + wxTAB_TRAVERSAL, wxWANTS_CHARS, wxPOPUP_WINDOW, @@ -663,13 +677,6 @@ enum { }; -#ifdef __WXGTK__ -#define wxDEFAULT_STATUSBAR_STYLE wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE -#else -#define wxDEFAULT_STATUSBAR_STYLE wxST_SIZEGRIP -#endif - - enum wxGeometryCentre {