X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/089142a562148d69dbccfba669b66eff78a7f5b5..3cebfef17b54f9dacc386f090827b8badb2773d2:/wxPython/src/_defs.i diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index e8b4f7fdd1..689847ac6d 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -40,13 +40,14 @@ typedef unsigned char byte; //---------------------------------------------------------------------- // Various SWIG macros and such -#define %addtofunc %feature("addtofunc") +#define %pythonAppend %feature("pythonappend") +#define %pythonPrepend %feature("pythonprepend") #define %kwargs %feature("kwargs") #define %nokwargs %feature("nokwargs") -#ifndef %shadow -#define %shadow %insert("shadow") -#endif +//#ifndef %shadow +//#define %shadow %insert("shadow") +//#endif #ifndef %pythoncode #define %pythoncode %insert("python") @@ -236,7 +237,7 @@ FORWARD_DECLARE(wxColour, Colour); FORWARD_DECLARE(wxFont, Font); FORWARD_DECLARE(wxCaret, Caret); FORWARD_DECLARE(wxToolTip, ToolTip); -FORWARD_DECLARE(wxPyDropTarget, PyDropTarget); +FORWARD_DECLARE(wxPyDropTarget, DropTarget); FORWARD_DECLARE(wxImageList, ImageList); FORWARD_DECLARE(wxMemoryDC, MemoryDC); FORWARD_DECLARE(wxHtmlTagHandler, HtmlTagHandler); @@ -543,6 +544,13 @@ enum { }; +#ifdef __WXGTK__ +#define wxDEFAULT_STATUSBAR_STYLE wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE +#else +#define wxDEFAULT_STATUSBAR_STYLE wxST_SIZEGRIP +#endif + + enum wxGeometryCentre { @@ -875,7 +883,7 @@ typedef enum { // menu and toolbar item kinds enum wxItemKind { - wxITEM_SEPARATOR = -1, + wxITEM_SEPARATOR, wxITEM_NORMAL, wxITEM_CHECK, wxITEM_RADIO,