Script updates

[wxWidgets.git] / wxPython / src / _defs.i

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index cb02767991d8fa8dfb069c31e2f6b8e5029fecfc..16ee85809661df0be1d621432e8154bb58896f89 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -40,13 +40,14 @@ typedef unsigned char   byte;
 //----------------------------------------------------------------------
 // Various SWIG macros and such
 
 //----------------------------------------------------------------------
 // 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")
 
 #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")
 
 #ifndef %pythoncode
 #define %pythoncode     %insert("python")


@@ -65,7 +66,7 @@ typedef unsigned char   byte;
 %enddef
 
 %define MAKE_CONST_WXSTRING2(strname, val)
 %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;
     %immutable;
     %name(strname) const wxString wxPy##strname;
     %mutable;


@@ -875,7 +876,7 @@ typedef enum {
 // menu and toolbar item kinds
 enum wxItemKind
 {
 // menu and toolbar item kinds
 enum wxItemKind
 {

-    wxITEM_SEPARATOR = -1,
+    wxITEM_SEPARATOR,

     wxITEM_NORMAL,
     wxITEM_CHECK,
     wxITEM_RADIO,
     wxITEM_NORMAL,
     wxITEM_CHECK,
     wxITEM_RADIO,