X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2dc104421c340091342156d6b01f61f1ccff438..52f52ebc4e0be6a9899d328b08db9eb14629d219:/wxPython/src/_defs.i?ds=inline

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index cb02767991..16ee858096 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")
@@ -65,7 +66,7 @@ typedef unsigned char   byte;
 %enddef
 
 %define MAKE_CONST_WXSTRING2(strname, val)
-    %{ static const wxString wxPy##strname(wxT(val)); %}
+    %{ static const wxString wxPy##strname(val); %}
     %immutable;
     %name(strname) const wxString wxPy##strname;
     %mutable;
@@ -875,7 +876,7 @@ typedef enum {
 // menu and toolbar item kinds
 enum wxItemKind
 {
-    wxITEM_SEPARATOR = -1,
+    wxITEM_SEPARATOR,
     wxITEM_NORMAL,
     wxITEM_CHECK,
     wxITEM_RADIO,