An incorrect patch to SWIG caused incorrect generated code. Fixed and regenerated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,19 +27,21 @@
|
||||
# define SWIGEXPORT(a) __declspec(dllexport) a
|
||||
# else
|
||||
# if defined(__BORLANDC__)
|
||||
# define SWIGEXPORT(a) a _export
|
||||
# define SWIGEXPORT(a) a _export
|
||||
# else
|
||||
# define SWIGEXPORT(a) a
|
||||
# define SWIGEXPORT(a) a
|
||||
# endif
|
||||
# endif
|
||||
#else
|
||||
# define SWIGEXPORT(a) a
|
||||
# define SWIGEXPORT(a) a
|
||||
#endif
|
||||
|
||||
#include "Python.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#include "Python.h"
|
||||
|
||||
extern void SWIG_MakePtr(char *, void *, char *);
|
||||
extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
|
||||
extern char *SWIG_GetPtr(char *, void **, char *);
|
||||
@@ -57,47 +59,28 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
|
||||
#include <wx/notebook.h>
|
||||
|
||||
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
if (!target) {
|
||||
target = o;
|
||||
} else if (target == Py_None) {
|
||||
Py_DECREF(Py_None);
|
||||
target = o;
|
||||
} else {
|
||||
if (!PyList_Check(target)) {
|
||||
o2 = target;
|
||||
target = PyList_New(0);
|
||||
PyList_Append(target, o2);
|
||||
Py_XDECREF(o2);
|
||||
}
|
||||
PyList_Append(target,o);
|
||||
Py_XDECREF(o);
|
||||
}
|
||||
return target;
|
||||
}
|
||||
|
||||
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
PyObject* o3;
|
||||
|
||||
if (!target) {
|
||||
if (!target) {
|
||||
target = o;
|
||||
} else if (target == Py_None) {
|
||||
} else if (target == Py_None) {
|
||||
Py_DECREF(Py_None);
|
||||
target = o;
|
||||
} else {
|
||||
} else {
|
||||
if (!PyTuple_Check(target)) {
|
||||
o2 = target;
|
||||
target = PyTuple_New(1);
|
||||
PyTuple_SetItem(target, 0, o2);
|
||||
}
|
||||
o3 = PyTuple_New(1);
|
||||
PyTuple_SetItem(o3, 0, o);
|
||||
o3 = PyTuple_New(1);
|
||||
PyTuple_SetItem(o3, 0, o);
|
||||
|
||||
o2 = target;
|
||||
target = PySequence_Concat(o2, o3);
|
||||
Py_DECREF(o2);
|
||||
target = PySequence_Concat(o2, o3);
|
||||
Py_DECREF(o2);
|
||||
Py_DECREF(o3);
|
||||
}
|
||||
return target;
|
||||
@@ -2974,36 +2957,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_byte","_unsigned_char",0},
|
||||
{ "_long","_unsigned_long",0},
|
||||
{ "_long","_signed_long",0},
|
||||
{ "_class_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
|
||||
{ "_class_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
|
||||
{ "_class_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer},
|
||||
{ "_class_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer},
|
||||
{ "_class_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
|
||||
{ "_class_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
|
||||
{ "_class_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
|
||||
{ "_class_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
|
||||
{ "_class_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer},
|
||||
{ "_class_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer},
|
||||
{ "_class_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer},
|
||||
{ "_class_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer},
|
||||
{ "_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
|
||||
{ "_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
|
||||
{ "_class_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
|
||||
{ "_class_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
|
||||
{ "_class_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject},
|
||||
{ "_class_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject},
|
||||
{ "_class_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
|
||||
{ "_class_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
|
||||
{ "_class_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
|
||||
{ "_class_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
|
||||
{ "_class_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject},
|
||||
{ "_class_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject},
|
||||
{ "_class_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject},
|
||||
{ "_class_wxObject","_wxPySizer",SwigwxPySizerTowxObject},
|
||||
{ "_class_wxObject","_class_wxSizer",SwigwxSizerTowxObject},
|
||||
{ "_class_wxObject","_wxSizer",SwigwxSizerTowxObject},
|
||||
{ "_class_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject},
|
||||
{ "_class_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject},
|
||||
{ "_size_t","_wxCoord",0},
|
||||
{ "_size_t","_wxPrintQuality",0},
|
||||
{ "_size_t","_time_t",0},
|
||||
@@ -3019,7 +2973,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_uint","_int",0},
|
||||
{ "_uint","_wxWindowID",0},
|
||||
{ "_wxChar","_char",0},
|
||||
{ "_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
|
||||
{ "_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
|
||||
{ "_char","_wxChar",0},
|
||||
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
|
||||
@@ -3040,24 +2993,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_WXTYPE","_unsigned_short",0},
|
||||
{ "_unsigned_short","_WXTYPE",0},
|
||||
{ "_unsigned_short","_short",0},
|
||||
{ "_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
|
||||
{ "_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
|
||||
{ "_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject},
|
||||
{ "_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject},
|
||||
{ "_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
|
||||
{ "_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
|
||||
{ "_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
|
||||
{ "_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
|
||||
{ "_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject},
|
||||
{ "_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject},
|
||||
{ "_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject},
|
||||
{ "_wxObject","_wxPySizer",SwigwxPySizerTowxObject},
|
||||
{ "_wxObject","_class_wxSizer",SwigwxSizerTowxObject},
|
||||
{ "_wxObject","_wxSizer",SwigwxSizerTowxObject},
|
||||
{ "_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject},
|
||||
{ "_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject},
|
||||
{ "_class_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
|
||||
{ "_class_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
|
||||
{ "_signed_short","_WXTYPE",0},
|
||||
{ "_signed_short","_short",0},
|
||||
{ "_unsigned_char","_byte",0},
|
||||
@@ -3071,8 +3014,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_short","_WXTYPE",0},
|
||||
{ "_short","_unsigned_short",0},
|
||||
{ "_short","_signed_short",0},
|
||||
{ "_class_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
|
||||
{ "_class_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
|
||||
{ "_wxWindowID","_wxCoord",0},
|
||||
{ "_wxWindowID","_wxPrintQuality",0},
|
||||
{ "_wxWindowID","_time_t",0},
|
||||
@@ -3107,17 +3048,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxCoord","_size_t",0},
|
||||
{ "_wxCoord","_time_t",0},
|
||||
{ "_wxCoord","_wxPrintQuality",0},
|
||||
{ "_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
|
||||
{ "_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
|
||||
{ "_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer},
|
||||
{ "_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer},
|
||||
{ "_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
|
||||
{ "_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
|
||||
{ "_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
|
||||
{ "_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
|
||||
{ "_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer},
|
||||
{ "_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer},
|
||||
{ "_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer},
|
||||
{ "_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer},
|
||||
{0,0,0}};
|
||||
|
||||
|
Reference in New Issue
Block a user