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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 66bd527637..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")
@@ -64,6 +65,16 @@ typedef unsigned char   byte;
     %mutable;
 %enddef
 
+%define MAKE_CONST_WXSTRING2(strname, val)
+    %{ static const wxString wxPy##strname(val); %}
+    %immutable;
+    %name(strname) const wxString wxPy##strname;
+    %mutable;
+%enddef
+
+%define MAKE_CONST_WXSTRING_NOSWIG(strname)
+    %{ static const wxString wxPy##strname(wx##strname); %}
+%enddef
 
 // Generate code in the module init for the event types, since they may not be
 // initialized yet when they are used in the static swig_const_table.
@@ -75,10 +86,15 @@ typedef unsigned char   byte;
 // Macros for the docstring and autodoc features of SWIG.
 
 // Set the docsring for the given full or partial declaration
-#define DocStr(decl, docstr)     %feature("docstring") decl docstr
+%define DocStr(decl, docstr)
+    %feature("docstring") decl docstr;
+    //%feature("refdoc") decl "";
+%enddef
 
 // Set the autodoc string for a full or partial declaration
-#define DocA(decl, astr)        %feature("autodoc") decl astr
+%define DocA(decl, astr)
+    %feature("autodoc") decl astr;
+%enddef
 
 // Set both the autodoc and docstring for a full or partial declaration
 %define DocAStr(decl, astr, docstr)
@@ -186,6 +202,7 @@ typedef unsigned char   byte;
 
 // A placeholder for the detailed reference docs.
 %define RefDoc(decl, docstr)
+        %feature("refdoc") decl docstr;       
 %enddef        
     
     
@@ -209,18 +226,24 @@ typedef unsigned char   byte;
     %enddef
 #endif
 
-FORWARD_DECLARE(wxString,       String);
-FORWARD_DECLARE(wxBitmap,       Bitmap);
-FORWARD_DECLARE(wxDateTime,     DateTime);
-FORWARD_DECLARE(wxInputStream,  InputStream);
-FORWARD_DECLARE(wxDC,           DC);
-FORWARD_DECLARE(wxCursor,       Cursor);
-FORWARD_DECLARE(wxRegion,       Region);
-FORWARD_DECLARE(wxColour,       Colour);
-FORWARD_DECLARE(wxFont,         Font);
-FORWARD_DECLARE(wxCaret,        Caret);
-FORWARD_DECLARE(wxToolTip,      ToolTip);
-FORWARD_DECLARE(wxPyDropTarget, PyDropTarget);
+FORWARD_DECLARE(wxString,         String);
+FORWARD_DECLARE(wxBitmap,         Bitmap);
+FORWARD_DECLARE(wxDateTime,       DateTime);
+FORWARD_DECLARE(wxInputStream,    InputStream);
+FORWARD_DECLARE(wxDC,             DC);
+FORWARD_DECLARE(wxCursor,         Cursor);
+FORWARD_DECLARE(wxRegion,         Region);
+FORWARD_DECLARE(wxColour,         Colour);
+FORWARD_DECLARE(wxFont,           Font);
+FORWARD_DECLARE(wxCaret,          Caret);
+FORWARD_DECLARE(wxToolTip,        ToolTip);
+FORWARD_DECLARE(wxPyDropTarget,   PyDropTarget);
+FORWARD_DECLARE(wxImageList,      ImageList);
+FORWARD_DECLARE(wxMemoryDC,       MemoryDC);
+FORWARD_DECLARE(wxHtmlTagHandler, HtmlTagHandler);
+FORWARD_DECLARE(wxConfigBase,     ConfigBase);
+FORWARD_DECLARE(wxIcon,           Icon);
+
 
 //---------------------------------------------------------------------------
 
@@ -853,7 +876,7 @@ typedef enum {
 // menu and toolbar item kinds
 enum wxItemKind
 {
-    wxITEM_SEPARATOR = -1,
+    wxITEM_SEPARATOR,
     wxITEM_NORMAL,
     wxITEM_CHECK,
     wxITEM_RADIO,