X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..5cd7ab8dd8af0c17ce9dad88830a8d7aefd4f73b:/wxPython/src/msw/core_wrap.cpp diff --git a/wxPython/src/msw/core_wrap.cpp b/wxPython/src/msw/core_wrap.cpp index d44415c7bd..753ba86965 100644 --- a/wxPython/src/msw/core_wrap.cpp +++ b/wxPython/src/msw/core_wrap.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.20 + * Version 1.3.22 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -45,6 +45,8 @@ private: #define SWIG_TypeName SWIG_Python_TypeName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData /*********************************************************************** @@ -59,36 +61,35 @@ private: #include -#if defined(_WIN32) || defined(__WIN32__) -# if defined(_MSC_VER) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif -# endif +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__GNUC__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) extern a +# else +# define SWIGEXPORT(a) __declspec(dllexport) a +# define SWIGIMPORT(a) extern a +# endif +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# define SWIGIMPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a +# endif +# endif #else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a #endif #ifdef SWIG_GLOBAL -#define SWIGRUNTIME(a) SWIGEXPORT(a) +# define SWIGRUNTIME(a) SWIGEXPORT(a) #else -#define SWIGRUNTIME(a) static a +# define SWIGRUNTIME(a) static a #endif - #ifdef __cplusplus extern "C" { #endif @@ -114,6 +115,8 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); +SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus @@ -130,7 +133,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -161,8 +163,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - - /* Common SWIG API */ #define SWIG_ConvertPtr(obj, pp, type, flags) \ SWIG_Python_ConvertPtr(obj, pp, type, flags) @@ -170,7 +170,7 @@ typedef struct swig_const_info { SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) \ SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_newvarlink() \ SWIG_Python_newvarlink() @@ -178,47 +178,32 @@ typedef struct swig_const_info { SWIG_Python_addvarlink(p, name, get_attr, set_attr) #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_PackData(c, ptr, sz) \ - SWIG_Python_PackData(c, ptr, sz) -#define SWIG_UnpackData(c, ptr, sz) \ - SWIG_Python_UnpackData(c, ptr, sz) #define SWIG_NewPackedObj(ptr, sz, type) \ SWIG_Python_NewPackedObj(ptr, sz, type) #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) +typedef double (*py_objasdbl_conv)(PyObject *obj); -SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); - -SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int); -SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } #endif - /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxLayoutConstraints swig_types[0] @@ -297,25 +282,25 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxGBSpan swig_types[73] #define SWIGTYPE_p_wxPropagateOnce swig_types[74] #define SWIGTYPE_p_wxAcceleratorTable swig_types[75] -#define SWIGTYPE_p_wxGBPosition swig_types[76] -#define SWIGTYPE_p_wxImage swig_types[77] -#define SWIGTYPE_p_wxFrame swig_types[78] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[79] -#define SWIGTYPE_p_wxImageHistogram swig_types[80] -#define SWIGTYPE_p_byte swig_types[81] -#define SWIGTYPE_p_wxPoint swig_types[82] -#define SWIGTYPE_p_wxCursor swig_types[83] -#define SWIGTYPE_p_wxObject swig_types[84] -#define SWIGTYPE_p_wxPyInputStream swig_types[85] -#define SWIGTYPE_p_wxOutputStream swig_types[86] -#define SWIGTYPE_p_wxInputStream swig_types[87] -#define SWIGTYPE_p_wxDateTime swig_types[88] -#define SWIGTYPE_p_wxKeyEvent swig_types[89] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[90] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[91] -#define SWIGTYPE_p_wxWindow swig_types[92] -#define SWIGTYPE_p_wxMenuBar swig_types[93] -#define SWIGTYPE_p_wxString swig_types[94] +#define SWIGTYPE_p_char swig_types[76] +#define SWIGTYPE_p_wxGBPosition swig_types[77] +#define SWIGTYPE_p_wxImage swig_types[78] +#define SWIGTYPE_p_wxFrame swig_types[79] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[80] +#define SWIGTYPE_p_wxImageHistogram swig_types[81] +#define SWIGTYPE_p_byte swig_types[82] +#define SWIGTYPE_p_wxPoint swig_types[83] +#define SWIGTYPE_p_wxCursor swig_types[84] +#define SWIGTYPE_p_wxObject swig_types[85] +#define SWIGTYPE_p_wxPyInputStream swig_types[86] +#define SWIGTYPE_p_wxOutputStream swig_types[87] +#define SWIGTYPE_p_wxInputStream swig_types[88] +#define SWIGTYPE_p_wxDateTime swig_types[89] +#define SWIGTYPE_p_wxKeyEvent swig_types[90] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[92] +#define SWIGTYPE_p_wxWindow swig_types[93] +#define SWIGTYPE_p_wxMenuBar swig_types[94] #define SWIGTYPE_p_wxFileSystem swig_types[95] #define SWIGTYPE_p_wxBitmap swig_types[96] #define SWIGTYPE_p_wxMenuEvent swig_types[97] @@ -327,7 +312,7 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPyApp swig_types[103] #define SWIGTYPE_p_wxCommandEvent swig_types[104] #define SWIGTYPE_p_wxPyCommandEvent swig_types[105] -#define SWIGTYPE_p_wxDropTarget swig_types[106] +#define SWIGTYPE_p_wxPyDropTarget swig_types[106] #define SWIGTYPE_p_wxChildFocusEvent swig_types[107] #define SWIGTYPE_p_wxFocusEvent swig_types[108] #define SWIGTYPE_p_wxDropFilesEvent swig_types[109] @@ -347,6 +332,49 @@ static swig_type_info *swig_types[115]; #define SWIG_name "_core" +/* Auxiliar swig macros */ + +#ifdef __cplusplus +#define SWIGSTATICINLINE(a) static inline a +#define SWIGSTATIC(a) static a +#define swig_new_array(type, size) (new type[(size)]) +#define swig_delete_array(cptr) delete[] cptr +#define swig_const_cast(type,a) const_cast(a) +#define swig_static_cast(type,a) static_cast(a) +#define swig_reinterpret_cast(type,a) reinterpret_cast(a) + +#ifdef HAVE_NUMERIC_CAST +#define swig_numeric_cast(type,a) numeric_cast(a) +#else +#define swig_numeric_cast(type,a) static_cast(a) +#endif + +#else /* C case */ + +#define SWIGSTATICINLINE(a) static a +#define SWIGSTATIC(a) static a +#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type))) +#define swig_delete_array(cptr) free((char*)cptr) +#define swig_const_cast(type,a) (type)(a) +#define swig_static_cast(type,a) (type)(a) +#define swig_reinterpret_cast(type,a) (type)(a) +#define swig_numeric_cast(type,a) (type)(a) + +#endif /* __cplusplus */ + + +#define SWIG_FromSignedChar PyInt_FromLong +#define SWIG_FromUnsignedChar PyInt_FromLong +#define SWIG_FromShort PyInt_FromLong +#define SWIG_FromUnsignedShort PyInt_FromLong +#define SWIG_FromInt PyInt_FromLong +#define SWIG_FromLong PyInt_FromLong +#define SWIG_FromFloat PyFloat_FromDouble +#define SWIG_FromDouble PyFloat_FromDouble +#define SWIG_FromFloat PyFloat_FromDouble +#define SWIG_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython_int.h" #include "wx/wxPython/pyclasses.h" @@ -425,12 +453,12 @@ PyObject* wxPyConstructObject(void* ptr, // Extract a pointer to the wrapped C++ object from a Python proxy object. // Ensures that the proxy object is of the specified (or derived) type. If // not able to perform the conversion then a Python exception is set and the -// error should be handled properly in the caller. Returns true on success. +// error should be handled properly in the caller. Returns True on success. bool wxPyConvertSwigPtr(PyObject* obj, void **ptr, const wxChar* className) { swig_type_info* swigType = wxPyFindSwigType(className); - wxCHECK_MSG(swigType != NULL, false, wxT("Unknown type in wxPyConvertSwigPtr")); + wxCHECK_MSG(swigType != NULL, False, wxT("Unknown type in wxPyConvertSwigPtr")); return SWIG_Python_ConvertPtr(obj, ptr, swigType, SWIG_POINTER_EXCEPTION) != -1; } @@ -549,10 +577,6 @@ static wxPyCoreAPI API = { #endif - DECLARE_DEF_STRING(EmptyString); - DECLARE_DEF_STRING(PanelNameStr); - - #if ! wxUSE_HOTKEY enum wxHotkeyModifier { @@ -565,6 +589,7 @@ enum wxHotkeyModifier #define wxEVT_HOTKEY 9999 #endif + static const wxString wxPyEmptyString(wxEmptyString); wxString wxObject_GetClassName(wxObject *self){ return self->GetClassInfo()->GetClassName(); } @@ -576,36 +601,139 @@ void wxObject_Destroy(wxObject *self){ #define wxCURSOR_COPY_ARROW wxCURSOR_ARROW #endif -PyObject *wxSize_asTuple(wxSize *self){ - wxPyBeginBlockThreads(); + +#include + + +SWIGSTATICINLINE(long) +SWIG_CheckLongInRange(long value, const char* type, + long min_value, long max_value) +{ + if (!PyErr_Occurred()) { + if (value < min_value) { + PyObject *err = + PyString_FromFormat("value %ld is less than '%s' minimum %ld", + value, type, min_value); + + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } else if (value > max_value) { + PyObject *err = + PyString_FromFormat("value %ld is greater than '%s' maximum %ld", + value, type, max_value); + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } + } + return value; +} + + +SWIGSTATICINLINE(long) +SWIG_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +#if INT_MAX != LONG_MAX +SWIGSTATICINLINE(int) +SWIG_AsInt(PyObject *obj) +{ + return swig_numeric_cast(int, + SWIG_CheckLongInRange(SWIG_AsLong(obj), + "int", INT_MIN, INT_MAX)); +} +#else +#define SWIG_AsInt SWIG_AsLong +#endif + + +SWIGSTATICINLINE(int) +SWIG_CheckInt(PyObject* obj) +{ + SWIG_AsInt(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + +PyObject *wxSize_Get(wxSize *self){ + bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } + +SWIGSTATICINLINE(double) +SWIG_AsDouble(PyObject *obj) +{ + double val = (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } + return val; +} + + +SWIGSTATICINLINE(int) +SWIG_CheckDouble(PyObject* obj) +{ + SWIG_AsDouble(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + void wxRealPoint_Set(wxRealPoint *self,double x,double y){ self->x = x; self->y = y; } -PyObject *wxRealPoint_asTuple(wxRealPoint *self){ - wxPyBeginBlockThreads(); +PyObject *wxRealPoint_Get(wxRealPoint *self){ + bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x)); PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } + +SWIGSTATICINLINE(int) +SWIG_CheckLong(PyObject* obj) +{ + SWIG_AsLong(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + void wxPoint_Set(wxPoint *self,long x,long y){ self->x = x; self->y = y; } -PyObject *wxPoint_asTuple(wxPoint *self){ - wxPyBeginBlockThreads(); +PyObject *wxPoint_Get(wxPoint *self){ + bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } void wxRect_Set(wxRect *self,int x,int y,int width,int height){ @@ -614,14 +742,14 @@ void wxRect_Set(wxRect *self,int x,int y,int width,int height){ self->width = width; self->height = height; } -PyObject *wxRect_asTuple(wxRect *self){ - wxPyBeginBlockThreads(); +PyObject *wxRect_Get(wxRect *self){ + bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(4); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width)); PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } @@ -635,10 +763,10 @@ PyObject *wxRect_asTuple(wxRect *self){ dest = reg1.GetBox(); if (dest != wxRect(0,0,0,0)) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxRect* newRect = new wxRect(dest); - obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true); - wxPyEndBlockThreads(); + obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True); + wxPyEndBlockThreads(blocked); return obj; } Py_INCREF(Py_None); @@ -676,12 +804,12 @@ void wxPoint2D_Set(wxPoint2D *self,double x,double y){ self->m_x = x; self->m_y = y; } -PyObject *wxPoint2D_asTuple(wxPoint2D *self){ - wxPyBeginBlockThreads(); +PyObject *wxPoint2D_Get(wxPoint2D *self){ + bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x)); PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } @@ -694,6 +822,113 @@ wxPyInputStream *new_wxPyInputStream(PyObject *p){ else return NULL; } + +SWIGSTATICINLINE(PyObject*) +SWIG_FromChar(char c) +{ + return PyString_FromStringAndSize(&c,1); +} + + +SWIGSTATICINLINE(PyObject* ) +SWIG_FromUnsignedLong(unsigned long value) +{ + return (value > LONG_MAX) ? + PyLong_FromUnsignedLong(value) + : PyInt_FromLong(swig_numeric_cast(long,value)); +} + + +/* returns '1' if the input is a raw char*, '0' if is a PyString */ +SWIGSTATIC(int) +SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* size) +{ + static swig_type_info* pchar_info = 0; + int psize = 0; + if (!pchar_info) pchar_info = SWIG_TypeQuery("char *"); + + if (SWIG_ConvertPtr(obj, swig_reinterpret_cast(void **,cptr), pchar_info, 0) == -1) { + PyErr_Clear(); + PyString_AsStringAndSize(obj, cptr, &psize); + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError,"a string is expected"); + } + if (size) *size = psize; + return 0; + } else { + if (size) *size = (*cptr) ? (strlen(*cptr) + 1) : 0; + return 1; + } +} + + +SWIGSTATIC(void) +SWIG_AsCharArray(PyObject *obj, char* carray, size_t size) +{ + char* cptr; size_t csize; + SWIG_AsCharPtrAndSize(obj, &cptr, &csize); + if (PyErr_Occurred()) { + PyErr_Clear(); + PyObject *err = + PyString_FromFormat("a char array of size %d is expected", size); + PyErr_SetObject(PyExc_TypeError, err); + Py_DECREF(err); + } else { + /* in C (but not in C++) you can do: + + char x[5] = "hello"; + + ie, assing the array using an extra '0' char. + */ +#ifndef __cplusplus + if ((csize == size + 1) && !(cptr[csize-1])) --csize; +#endif + if (csize > size) { + PyObject *err = + PyString_FromFormat("a char array of maximum size %d is expected", + size); + PyErr_SetObject(PyExc_TypeError, err); + Py_DECREF(err); + } else { + if (csize) memcpy(carray, cptr, csize); + if (csize < size) memset(carray + csize, 0, size - csize); + } + } +} + + +SWIGSTATICINLINE(char) +SWIG_AsChar(PyObject *obj) +{ + char c = 0; + if (PyInt_Check(obj) || PyLong_Check(obj)) { + c = swig_numeric_cast(char, + SWIG_CheckLongInRange(SWIG_AsLong(obj), + "char", CHAR_MIN, CHAR_MAX)); + } else { + SWIG_AsCharArray(obj, &c, 1); + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a char is expected"); + } + } + return c; +} + + +SWIGSTATICINLINE(int) +SWIG_CheckChar(PyObject* obj) +{ + SWIG_AsChar(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + void wxOutputStream_write(wxOutputStream *self,PyObject *obj){ // We use only strings for the streams, not unicode PyObject* str = PyObject_Str(obj); @@ -749,6 +984,26 @@ IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext); +SWIGSTATICINLINE(bool) +SWIG_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATICINLINE(int) +SWIG_CheckBool(PyObject* obj) +{ + SWIG_AsBool(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + + wxString wxFileSystem_URLToFileName(const wxString& url) { wxFileName fname = wxFileSystem::URLToFileName(url); return fname.GetFullPath(); @@ -778,6 +1033,60 @@ IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext #include "wx/wxPython/pyistream.h" + +SWIGSTATICINLINE(unsigned long) +SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type, + unsigned long max_value) +{ + if (!PyErr_Occurred()) { + if (value > max_value) { + PyObject *err = + PyString_FromFormat("value %ld is greater than '%s' minimum %ld", + value, type, max_value); + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } + } + return value; +} + + +SWIGSTATICINLINE(unsigned long) +SWIG_AsUnsignedLong(PyObject * obj) +{ + if (PyLong_Check(obj)) { + return PyLong_AsUnsignedLong(obj); + } else { + long i = PyInt_AsLong(obj); + if ( !PyErr_Occurred() && (i < 0)) { + PyErr_SetString(PyExc_TypeError, "negative value for unsigned type"); + } + return i; + } +} + + +SWIGSTATICINLINE(unsigned char) +SWIG_AsUnsignedChar(PyObject *obj) +{ + return swig_numeric_cast(unsigned char, + SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj), + "unsigned char", UCHAR_MAX)); +} + + +SWIGSTATICINLINE(int) +SWIG_CheckUnsignedChar(PyObject* obj) +{ + SWIG_AsUnsignedChar(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + wxImage *new_wxImage(int width,int height,bool clear){ if (width > 0 && height > 0) return new wxImage(width, height, clear); @@ -795,7 +1104,7 @@ wxImage *new_wxImage(int width,int height,unsigned char *data){ return NULL; } memcpy(copy, data, width*height*3); - return new wxImage(width, height, copy, FALSE); + return new wxImage(width, height, copy, False); } PyObject *wxImage_GetData(wxImage *self){ unsigned char* data = self->GetData(); @@ -829,7 +1138,7 @@ void wxImage_SetDataBuffer(wxImage *self,PyObject *data){ unsigned char* buffer; int size; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (!PyArg_Parse(data, "t#", &buffer, &size)) goto done; @@ -839,7 +1148,7 @@ void wxImage_SetDataBuffer(wxImage *self,PyObject *data){ } self->SetData(buffer); done: - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } PyObject *wxImage_GetAlphaData(wxImage *self){ unsigned char* data = self->GetAlpha(); @@ -877,7 +1186,7 @@ void wxImage_SetAlphaBuffer(wxImage *self,PyObject *data){ unsigned char* buffer; int size; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (!PyArg_Parse(data, "t#", &buffer, &size)) goto done; @@ -887,8 +1196,21 @@ void wxImage_SetAlphaBuffer(wxImage *self,PyObject *data){ } self->SetAlpha(buffer); done: - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } + +SWIGSTATICINLINE(int) +SWIG_CheckUnsignedLong(PyObject* obj) +{ + SWIG_AsUnsignedLong(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + wxBitmap wxImage_ConvertToBitmap(wxImage *self){ wxBitmap bitmap(*self); return bitmap; @@ -935,12 +1257,45 @@ void wxEvtHandler__setOORInfo(wxEvtHandler *self,PyObject *_self){ } } int wxKeyEvent_GetUniChar(wxKeyEvent *self){ - - - + #if wxUSE_UNICODE + return self->m_uniChar; + #else return 0; - + #endif } + +#if UINT_MAX < LONG_MAX +#define SWIG_FromUnsignedInt SWIG_FromLong +#else +#define SWIG_FromUnsignedInt SWIG_FromUnsignedLong +#endif + + +#if UINT_MAX != ULONG_MAX +SWIGSTATICINLINE(unsigned int) +SWIG_AsUnsignedInt(PyObject *obj) +{ + return swig_numeric_cast(unsigned int, + SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj), + "unsigned int", UINT_MAX)); +} +#else +#define SWIG_AsUnsignedInt SWIG_AsUnsignedLong +#endif + + +SWIGSTATICINLINE(int) +SWIG_CheckUnsignedInt(PyObject* obj) +{ + SWIG_AsUnsignedInt(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ self->m_size = size; } @@ -958,11 +1313,7 @@ PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){ } for (int i=0; iGetChildren(); return wxPy_ConvertList(&list); @@ -992,14 +1344,14 @@ bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keyco - return FALSE; + return False; } bool wxWindow_UnregisterHotKey(wxWindow *self,int hotkeyId){ - return FALSE; + return False; } long wxWindow_GetHandle(wxWindow *self){ @@ -1021,14 +1373,26 @@ wxWindow* wxFindWindowByLabel( const wxString& label, } - wxWindow* wxWindow_FromHWND(unsigned long hWnd) { #ifdef __WXMSW__ +#include // to get wxGetWindowId +#endif + + + wxWindow* wxWindow_FromHWND(wxWindow* parent, unsigned long _hWnd) { +#ifdef __WXMSW__ + WXHWND hWnd = (WXHWND)_hWnd; + long id = wxGetWindowId(hWnd); wxWindow* win = new wxWindow; + parent->AddChild(win); + win->SetEventHandler(win); win->SetHWND(hWnd); + win->SetId(id); win->SubclassWin(hWnd); + win->AdoptAttributesFromHWND(); + win->SetupColours(); return win; #else - PyErr_SetNone(PyExc_NotImplementedError); + wxPyRaiseNotImplemented(); return NULL; #endif } @@ -1045,9 +1409,7 @@ PyObject *wxMenu_GetMenuItems(wxMenu *self){ wxMenuItemList& list = self->GetMenuItems(); return wxPy_ConvertList(&list); } - - DECLARE_DEF_STRING(ControlNameStr); - + static const wxString wxPyControlNameStr(wxControlNameStr); int wxItemContainer_Append(wxItemContainer *self,wxString const &item,PyObject *clientData){ if (clientData) { wxPyClientData* data = new wxPyClientData(clientData); @@ -1078,6 +1440,53 @@ void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObject *clientD } + +#include + +SWIGSTATIC(float) +SWIG_FloatCast(double value) +{ + float f = 0; + if (!PyErr_Occurred()) { + if (value < FLT_MIN) { + PyObject *err = + PyString_FromFormat("value %g is less than float minimum %g", + value, FLT_MIN); + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } else if (value > FLT_MAX) { + PyObject *err = + PyString_FromFormat("value %g is greater than float maximum %g", + value, FLT_MAX); + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } else { + f = swig_numeric_cast(float, value); + } + } + return f; +} + + +SWIGSTATICINLINE(float) +SWIG_AsFloat(PyObject *obj) +{ + return SWIG_FloatCast(SWIG_AsDouble(obj)); +} + + +SWIGSTATICINLINE(int) +SWIG_CheckFloat(PyObject* obj) +{ + SWIG_AsFloat(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + PyObject *wxSizerItem_GetUserData(wxSizerItem *self){ wxPyUserData* data = (wxPyUserData*)self->GetUserData(); if (data) { @@ -1093,8 +1502,8 @@ PyObject *wxSizerItem_GetUserData(wxSizerItem *self){ struct wxPySizerItemInfo { wxPySizerItemInfo() - : window(NULL), sizer(NULL), gotSize(false), - size(wxDefaultSize), gotPos(false), pos(-1) + : window(NULL), sizer(NULL), gotSize(False), + size(wxDefaultSize), gotPos(False), pos(-1) {} wxWindow* window; @@ -1125,13 +1534,13 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize, // try wxSize or (w,h) if ( checkSize && wxSize_helper(item, &sizePtr)) { info.size = *sizePtr; - info.gotSize = true; + info.gotSize = True; } // or a single int if (checkIdx && PyInt_Check(item)) { info.pos = PyInt_AsLong(item); - info.gotPos = true; + info.gotPos = True; } } } @@ -1158,11 +1567,11 @@ void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){ void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){ wxPyUserData* data = NULL; - wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + bool blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found if ( info.window ) @@ -1176,11 +1585,11 @@ void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border void wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion,int flag,int border,PyObject *userData){ wxPyUserData* data = NULL; - wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + bool blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // Now call the real Insert method if a valid item type was found if ( info.window ) @@ -1194,11 +1603,11 @@ void wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion,int f void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){ wxPyUserData* data = NULL; - wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + bool blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // Now call the real Prepend method if a valid item type was found if ( info.window ) @@ -1210,9 +1619,9 @@ void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int bo proportion, flag, border, data); } bool wxSizer_Remove(wxSizer *self,PyObject *item){ - wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); - wxPyEndBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True); + wxPyEndBlockThreads(blocked); if ( info.window ) return self->Remove(info.window); else if ( info.sizer ) @@ -1220,12 +1629,12 @@ bool wxSizer_Remove(wxSizer *self,PyObject *item){ else if ( info.gotPos ) return self->Remove(info.pos); else - return FALSE; + return False; } -void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize size){ - wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); - wxPyEndBlockThreads(); +void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize const &size){ + bool blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True); + wxPyEndBlockThreads(blocked); if ( info.window ) self->SetItemMinSize(info.window, size); else if ( info.sizer ) @@ -1238,27 +1647,27 @@ PyObject *wxSizer_GetChildren(wxSizer *self){ return wxPy_ConvertList(&list); } void wxSizer_Show(wxSizer *self,PyObject *item,bool show){ - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); if ( info.window ) self->Show(info.window, show); else if ( info.sizer ) self->Show(info.sizer, show); } void wxSizer_Hide(wxSizer *self,PyObject *item){ - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); if ( info.window ) self->Hide(info.window); else if ( info.sizer ) self->Hide(info.sizer); } bool wxSizer_IsShown(wxSizer *self,PyObject *item){ - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); if ( info.window ) return self->IsShown(info.window); else if ( info.sizer ) return self->IsShown(info.sizer); else - return false; + return False; } // See pyclasses.h @@ -1271,39 +1680,55 @@ IMPLEMENT_DYNAMIC_CLASS(wxPySizer, wxSizer); bool wxGBPosition_helper(PyObject* source, wxGBPosition** obj) { + if (source == Py_None) { + **obj = wxGBPosition(-1,-1); + return True; + } return wxPyTwoIntItem_helper(source, obj, wxT("wxGBPosition")); } bool wxGBSpan_helper(PyObject* source, wxGBSpan** obj) { + if (source == Py_None) { + **obj = wxGBSpan(-1,-1); + return True; + } return wxPyTwoIntItem_helper(source, obj, wxT("wxGBSpan")); } -PyObject *wxGBPosition_asTuple(wxGBPosition *self){ - wxPyBeginBlockThreads(); +void wxGBPosition_Set(wxGBPosition *self,int row,int col){ + self->SetRow(row); + self->SetCol(col); + } +PyObject *wxGBPosition_Get(wxGBPosition *self){ + bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } -PyObject *wxGBSpan_asTuple(wxGBSpan *self){ - wxPyBeginBlockThreads(); +void wxGBSpan_Set(wxGBSpan *self,int rowspan,int colspan){ + self->SetRowspan(rowspan); + self->SetColspan(colspan); + } +PyObject *wxGBSpan_Get(wxGBSpan *self){ + bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan())); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetColspan())); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &pos,wxGBSpan const &span,int flag,int border,PyObject *userData){ wxPyUserData* data = NULL; - wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + bool blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found if ( info.window ) @@ -1313,13 +1738,33 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const & else if (info.gotSize) return self->Add(info.size.GetWidth(), info.size.GetHeight(), pos, span, flag, border, data); - return false; + return False; } #ifdef __cplusplus extern "C" { #endif +static int _wrap_EmptyString_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only."); + return 1; +} + + +static PyObject *_wrap_EmptyString_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxObject *arg1 = (wxObject *) 0 ; @@ -1330,7 +1775,8 @@ static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Object_GetClassName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxObject_GetClassName(arg1); @@ -1360,7 +1806,8 @@ static PyObject *_wrap_Object_Destroy(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Object_Destroy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxObject_Destroy(arg1); @@ -1387,12 +1834,16 @@ static PyObject *_wrap_Size_width_set(PyObject *self, PyObject *args, PyObject * wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_width_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_width_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1412,10 +1863,11 @@ static PyObject *_wrap_Size_width_get(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_width_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1427,12 +1879,16 @@ static PyObject *_wrap_Size_height_set(PyObject *self, PyObject *args, PyObject wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_height_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_height_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1452,10 +1908,11 @@ static PyObject *_wrap_Size_height_get(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_height_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1467,11 +1924,21 @@ static PyObject *_wrap_new_Size(PyObject *self, PyObject *args, PyObject *kwargs int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxSize *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Size",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Size",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSize *)new wxSize(arg1,arg2); @@ -1479,7 +1946,7 @@ static PyObject *_wrap_new_Size(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSize, 1); return resultobj; fail: return NULL; @@ -1495,7 +1962,8 @@ static PyObject *_wrap_delete_Size(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Size",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -1523,19 +1991,22 @@ static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSize const *)arg1)->operator ==((wxSize const &)*arg2); + result = (bool)(arg1)->operator ==((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1555,19 +2026,22 @@ static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSize const *)arg1)->operator !=((wxSize const &)*arg2); + result = (bool)(arg1)->operator !=((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1587,7 +2061,8 @@ static PyObject *_wrap_Size___add__(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___add__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -1602,7 +2077,7 @@ static PyObject *_wrap_Size___add__(PyObject *self, PyObject *args, PyObject *kw { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -1623,7 +2098,8 @@ static PyObject *_wrap_Size___sub__(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___sub__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -1638,7 +2114,7 @@ static PyObject *_wrap_Size___sub__(PyObject *self, PyObject *args, PyObject *kw { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -1658,7 +2134,8 @@ static PyObject *_wrap_Size_IncTo(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_IncTo",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -1689,7 +2166,8 @@ static PyObject *_wrap_Size_DecTo(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_DecTo",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -1714,12 +2192,19 @@ static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "xx",(char *) "yy", NULL + (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Size_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Size_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set(arg2,arg3); @@ -1739,12 +2224,16 @@ static PyObject *_wrap_Size_SetWidth(PyObject *self, PyObject *args, PyObject *k wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_SetWidth",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetWidth",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1764,12 +2253,16 @@ static PyObject *_wrap_Size_SetHeight(PyObject *self, PyObject *args, PyObject * wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_SetHeight",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetHeight",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -1794,7 +2287,8 @@ static PyObject *_wrap_Size_GetWidth(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxSize const *)arg1)->GetWidth(); @@ -1802,7 +2296,7 @@ static PyObject *_wrap_Size_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1819,7 +2313,8 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxSize const *)arg1)->GetHeight(); @@ -1827,64 +2322,14 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Size_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxSize *arg1 = (wxSize *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetX",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxSize const *)arg1)->GetX(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_Size_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxSize *arg1 = (wxSize *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetY",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxSize const *)arg1)->GetY(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Size_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Size_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSize *arg1 = (wxSize *) 0 ; PyObject *result; @@ -1893,11 +2338,12 @@ static PyObject *_wrap_Size_asTuple(PyObject *self, PyObject *args, PyObject *kw (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_asTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_Get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxSize_asTuple(arg1); + result = (PyObject *)wxSize_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -1921,12 +2367,16 @@ static PyObject *_wrap_RealPoint_x_set(PyObject *self, PyObject *args, PyObject wxRealPoint *arg1 = (wxRealPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:RealPoint_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_x_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1946,10 +2396,11 @@ static PyObject *_wrap_RealPoint_x_get(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->x); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1961,12 +2412,16 @@ static PyObject *_wrap_RealPoint_y_set(PyObject *self, PyObject *args, PyObject wxRealPoint *arg1 = (wxRealPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:RealPoint_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_y_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1986,10 +2441,11 @@ static PyObject *_wrap_RealPoint_y_get(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->y); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -2001,11 +2457,21 @@ static PyObject *_wrap_new_RealPoint(PyObject *self, PyObject *args, PyObject *k double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxRealPoint *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_RealPoint",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_RealPoint",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRealPoint *)new wxRealPoint(arg1,arg2); @@ -2013,7 +2479,7 @@ static PyObject *_wrap_new_RealPoint(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRealPoint, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRealPoint, 1); return resultobj; fail: return NULL; @@ -2029,7 +2495,8 @@ static PyObject *_wrap_delete_RealPoint(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_RealPoint",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -2044,11 +2511,11 @@ static PyObject *_wrap_delete_RealPoint(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - wxRealPoint result; + bool result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2056,23 +2523,22 @@ static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObjec (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___add__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxRealPoint const *)arg1)->operator +((wxRealPoint const &)*arg2); + result = (bool)(arg1)->operator ==((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { - wxRealPoint * resultptr; - resultptr = new wxRealPoint((wxRealPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } return resultobj; fail: @@ -2080,11 +2546,11 @@ static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - wxRealPoint result; + bool result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2092,23 +2558,22 @@ static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObjec (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___sub__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxRealPoint const *)arg1)->operator -((wxRealPoint const &)*arg2); + result = (bool)(arg1)->operator !=((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { - wxRealPoint * resultptr; - resultptr = new wxRealPoint((wxRealPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } return resultobj; fail: @@ -2116,11 +2581,11 @@ static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - bool result; + wxRealPoint result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2128,31 +2593,36 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___add__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRealPoint const *)arg1)->operator ==((wxRealPoint const &)*arg2); + result = (arg1)->operator +((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + wxRealPoint * resultptr; + resultptr = new wxRealPoint((wxRealPoint &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - bool result; + wxRealPoint result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2160,20 +2630,25 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___sub__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRealPoint const *)arg1)->operator !=((wxRealPoint const &)*arg2); + result = (arg1)->operator -((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + wxRealPoint * resultptr; + resultptr = new wxRealPoint((wxRealPoint &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1); + } return resultobj; fail: return NULL; @@ -2186,12 +2661,19 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:RealPoint_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RealPoint_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRealPoint_Set(arg1,arg2,arg3); @@ -2206,7 +2688,7 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_RealPoint_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; PyObject *result; @@ -2215,11 +2697,12 @@ static PyObject *_wrap_RealPoint_asTuple(PyObject *self, PyObject *args, PyObjec (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_asTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_Get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxRealPoint_asTuple(arg1); + result = (PyObject *)wxRealPoint_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2243,12 +2726,16 @@ static PyObject *_wrap_Point_x_set(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg1 = (wxPoint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Point_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_x_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2268,10 +2755,11 @@ static PyObject *_wrap_Point_x_get(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -2283,12 +2771,16 @@ static PyObject *_wrap_Point_y_set(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg1 = (wxPoint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Point_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_y_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2308,10 +2800,11 @@ static PyObject *_wrap_Point_y_get(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -2323,11 +2816,21 @@ static PyObject *_wrap_new_Point(PyObject *self, PyObject *args, PyObject *kwarg int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxPoint *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Point",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPoint *)new wxPoint(arg1,arg2); @@ -2335,7 +2838,7 @@ static PyObject *_wrap_new_Point(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 1); return resultobj; fail: return NULL; @@ -2351,7 +2854,8 @@ static PyObject *_wrap_delete_Point(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Point",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -2375,23 +2879,26 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPoint const *)arg1)->operator ==((wxPoint const &)*arg2); + result = (bool)(arg1)->operator ==((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2407,23 +2914,26 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPoint const *)arg1)->operator !=((wxPoint const &)*arg2); + result = (bool)(arg1)->operator !=((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2439,18 +2949,19 @@ static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___add__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPoint const *)arg1)->operator +((wxPoint const &)*arg2); + result = (arg1)->operator +((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2458,7 +2969,7 @@ static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *k { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -2475,18 +2986,19 @@ static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___sub__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPoint const *)arg1)->operator -((wxPoint const &)*arg2); + result = (arg1)->operator -((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2494,7 +3006,7 @@ static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *k { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -2511,11 +3023,12 @@ static PyObject *_wrap_Point___iadd__(PyObject *self, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___iadd__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -2530,7 +3043,7 @@ static PyObject *_wrap_Point___iadd__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0); return resultobj; fail: return NULL; @@ -2546,11 +3059,12 @@ static PyObject *_wrap_Point___isub__(PyObject *self, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___isub__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -2565,7 +3079,7 @@ static PyObject *_wrap_Point___isub__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0); return resultobj; fail: return NULL; @@ -2578,12 +3092,19 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:Point_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Point_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (long) SWIG_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPoint_Set(arg1,arg2,arg3); @@ -2598,7 +3119,7 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg } -static PyObject *_wrap_Point_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Point_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPoint *arg1 = (wxPoint *) 0 ; PyObject *result; @@ -2607,11 +3128,12 @@ static PyObject *_wrap_Point_asTuple(PyObject *self, PyObject *args, PyObject *k (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_asTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_Get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPoint_asTuple(arg1); + result = (PyObject *)wxPoint_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2637,11 +3159,31 @@ static PyObject *_wrap_new_Rect(PyObject *self, PyObject *args, PyObject *kwargs int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxRect *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_Rect",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Rect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRect *)new wxRect(arg1,arg2,arg3,arg4); @@ -2649,7 +3191,7 @@ static PyObject *_wrap_new_Rect(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 1); return resultobj; fail: return NULL; @@ -2685,7 +3227,7 @@ static PyObject *_wrap_new_RectPP(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 1); return resultobj; fail: return NULL; @@ -2721,7 +3263,7 @@ static PyObject *_wrap_new_RectPS(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 1); return resultobj; fail: return NULL; @@ -2737,7 +3279,8 @@ static PyObject *_wrap_delete_Rect(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Rect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -2762,7 +3305,8 @@ static PyObject *_wrap_Rect_GetX(PyObject *self, PyObject *args, PyObject *kwarg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetX",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRect const *)arg1)->GetX(); @@ -2770,7 +3314,7 @@ static PyObject *_wrap_Rect_GetX(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -2782,12 +3326,16 @@ static PyObject *_wrap_Rect_SetX(PyObject *self, PyObject *args, PyObject *kwarg wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetX",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetX",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetX(arg2); @@ -2812,7 +3360,8 @@ static PyObject *_wrap_Rect_GetY(PyObject *self, PyObject *args, PyObject *kwarg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetY",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetY(); @@ -2820,7 +3369,7 @@ static PyObject *_wrap_Rect_GetY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -2832,12 +3381,16 @@ static PyObject *_wrap_Rect_SetY(PyObject *self, PyObject *args, PyObject *kwarg wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetY",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetY",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetY(arg2); @@ -2862,7 +3415,8 @@ static PyObject *_wrap_Rect_GetWidth(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRect const *)arg1)->GetWidth(); @@ -2870,7 +3424,7 @@ static PyObject *_wrap_Rect_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -2882,12 +3436,16 @@ static PyObject *_wrap_Rect_SetWidth(PyObject *self, PyObject *args, PyObject *k wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetWidth",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetWidth",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -2912,7 +3470,8 @@ static PyObject *_wrap_Rect_GetHeight(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRect const *)arg1)->GetHeight(); @@ -2920,7 +3479,7 @@ static PyObject *_wrap_Rect_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -2932,12 +3491,16 @@ static PyObject *_wrap_Rect_SetHeight(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetHeight",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetHeight",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -2962,7 +3525,8 @@ static PyObject *_wrap_Rect_GetPosition(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxRect const *)arg1)->GetPosition(); @@ -2973,7 +3537,7 @@ static PyObject *_wrap_Rect_GetPosition(PyObject *self, PyObject *args, PyObject { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -2993,7 +3557,8 @@ static PyObject *_wrap_Rect_SetPosition(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -3022,7 +3587,8 @@ static PyObject *_wrap_Rect_GetSize(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxRect const *)arg1)->GetSize(); @@ -3033,7 +3599,7 @@ static PyObject *_wrap_Rect_GetSize(PyObject *self, PyObject *args, PyObject *kw { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -3053,7 +3619,8 @@ static PyObject *_wrap_Rect_SetSize(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -3072,6 +3639,130 @@ static PyObject *_wrap_Rect_SetSize(PyObject *self, PyObject *args, PyObject *kw } +static PyObject *_wrap_Rect_GetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetTopLeft",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxRect const *)arg1)->GetTopLeft(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_SetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "p", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTopLeft",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetTopLeft((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_GetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetBottomRight",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxRect const *)arg1)->GetBottomRight(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_SetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "p", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottomRight",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetBottomRight((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; @@ -3082,7 +3773,8 @@ static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetLeft",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRect const *)arg1)->GetLeft(); @@ -3090,7 +3782,7 @@ static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3107,7 +3799,8 @@ static PyObject *_wrap_Rect_GetTop(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetTop",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRect const *)arg1)->GetTop(); @@ -3115,7 +3808,7 @@ static PyObject *_wrap_Rect_GetTop(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3132,7 +3825,8 @@ static PyObject *_wrap_Rect_GetBottom(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetBottom",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRect const *)arg1)->GetBottom(); @@ -3140,7 +3834,7 @@ static PyObject *_wrap_Rect_GetBottom(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3157,7 +3851,8 @@ static PyObject *_wrap_Rect_GetRight(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetRight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRect const *)arg1)->GetRight(); @@ -3165,7 +3860,7 @@ static PyObject *_wrap_Rect_GetRight(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3177,12 +3872,16 @@ static PyObject *_wrap_Rect_SetLeft(PyObject *self, PyObject *args, PyObject *kw wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "left", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetLeft",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetLeft",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLeft(arg2); @@ -3202,12 +3901,16 @@ static PyObject *_wrap_Rect_SetRight(PyObject *self, PyObject *args, PyObject *k wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "right", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetRight",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetRight",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRight(arg2); @@ -3227,12 +3930,16 @@ static PyObject *_wrap_Rect_SetTop(PyObject *self, PyObject *args, PyObject *kwa wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "top", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetTop",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTop",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTop(arg2); @@ -3252,12 +3959,16 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bottom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetBottom",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottom",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBottom(arg2); @@ -3275,16 +3986,23 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; wxRect *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_Inflate",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Inflate",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -3295,7 +4013,7 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0); return resultobj; fail: return NULL; @@ -3305,16 +4023,23 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; wxRect *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_Deflate",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Deflate",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -3325,7 +4050,7 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0); return resultobj; fail: return NULL; @@ -3335,15 +4060,22 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_OffsetXY",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_OffsetXY",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Offset(arg2,arg3); @@ -3370,7 +4102,8 @@ static PyObject *_wrap_Rect_Offset(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Offset",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -3402,7 +4135,8 @@ static PyObject *_wrap_Rect_Intersect(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Intersect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -3417,7 +4151,7 @@ static PyObject *_wrap_Rect_Intersect(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0); return resultobj; fail: return NULL; @@ -3437,7 +4171,8 @@ static PyObject *_wrap_Rect___add__(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___add__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -3452,7 +4187,7 @@ static PyObject *_wrap_Rect___add__(PyObject *self, PyObject *args, PyObject *kw { wxRect * resultptr; resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1); } return resultobj; fail: @@ -3473,7 +4208,8 @@ static PyObject *_wrap_Rect___iadd__(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___iadd__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -3488,7 +4224,7 @@ static PyObject *_wrap_Rect___iadd__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0); return resultobj; fail: return NULL; @@ -3508,7 +4244,8 @@ static PyObject *_wrap_Rect___eq__(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -3520,7 +4257,9 @@ static PyObject *_wrap_Rect___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3540,7 +4279,8 @@ static PyObject *_wrap_Rect___ne__(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -3552,7 +4292,9 @@ static PyObject *_wrap_Rect___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3566,12 +4308,19 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_InsideXY",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxRect const *)arg1)->Inside(arg2,arg3); @@ -3579,7 +4328,9 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3599,7 +4350,8 @@ static PyObject *_wrap_Rect_Inside(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Inside",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -3611,7 +4363,9 @@ static PyObject *_wrap_Rect_Inside(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3631,7 +4385,8 @@ static PyObject *_wrap_Rect_Intersects(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Intersects",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -3643,7 +4398,9 @@ static PyObject *_wrap_Rect_Intersects(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3655,12 +4412,16 @@ static PyObject *_wrap_Rect_x_set(PyObject *self, PyObject *args, PyObject *kwar wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_x_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3680,10 +4441,11 @@ static PyObject *_wrap_Rect_x_get(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3695,12 +4457,16 @@ static PyObject *_wrap_Rect_y_set(PyObject *self, PyObject *args, PyObject *kwar wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_y_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3720,10 +4486,11 @@ static PyObject *_wrap_Rect_y_get(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3735,12 +4502,16 @@ static PyObject *_wrap_Rect_width_set(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_width_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_width_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->width = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3760,10 +4531,11 @@ static PyObject *_wrap_Rect_width_get(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_width_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->width); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3775,12 +4547,16 @@ static PyObject *_wrap_Rect_height_set(PyObject *self, PyObject *args, PyObject wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_height_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_height_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->height = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3800,10 +4576,11 @@ static PyObject *_wrap_Rect_height_get(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_height_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->height); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -3818,12 +4595,33 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiii:Rect_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:Rect_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRect_Set(arg1,arg2,arg3,arg4,arg5); @@ -3838,7 +4636,7 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs } -static PyObject *_wrap_Rect_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Rect_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; PyObject *result; @@ -3847,11 +4645,12 @@ static PyObject *_wrap_Rect_asTuple(PyObject *self, PyObject *args, PyObject *kw (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_asTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_Get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxRect_asTuple(arg1); + result = (PyObject *)wxRect_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3882,8 +4681,10 @@ static PyObject *_wrap_IntersectRect(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IntersectRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxIntersectRect(arg1,arg2); @@ -3903,11 +4704,21 @@ static PyObject *_wrap_new_Point2D(PyObject *self, PyObject *args, PyObject *kwa double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPoint2D *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_Point2D",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point2D",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPoint2D *)new wxPoint2D(arg1,arg2); @@ -3915,7 +4726,7 @@ static PyObject *_wrap_new_Point2D(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint2D, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 1); return resultobj; fail: return NULL; @@ -3944,7 +4755,7 @@ static PyObject *_wrap_new_Point2DCopy(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint2D, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 1); return resultobj; fail: return NULL; @@ -3973,7 +4784,7 @@ static PyObject *_wrap_new_Point2DFromPoint(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint2D, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 1); return resultobj; fail: return NULL; @@ -3995,7 +4806,8 @@ static PyObject *_wrap_Point2D_GetFloor(PyObject *self, PyObject *args, PyObject arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetFloor",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxPoint2D const *)arg1)->GetFloor(arg2,arg3); @@ -4033,7 +4845,8 @@ static PyObject *_wrap_Point2D_GetRounded(PyObject *self, PyObject *args, PyObje arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetRounded",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxPoint2D const *)arg1)->GetRounded(arg2,arg3); @@ -4066,7 +4879,8 @@ static PyObject *_wrap_Point2D_GetVectorLength(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetVectorLength",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)((wxPoint2D const *)arg1)->GetVectorLength(); @@ -4074,7 +4888,7 @@ static PyObject *_wrap_Point2D_GetVectorLength(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4091,7 +4905,8 @@ static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetVectorAngle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)((wxPoint2D const *)arg1)->GetVectorAngle(); @@ -4099,7 +4914,7 @@ static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4111,12 +4926,16 @@ static PyObject *_wrap_Point2D_SetVectorLength(PyObject *self, PyObject *args, P wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "length", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_SetVectorLength",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorLength",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVectorLength(arg2); @@ -4136,12 +4955,16 @@ static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *self, PyObject *args, Py wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "degrees", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_SetVectorAngle",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorAngle",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVectorAngle(arg2); @@ -4169,7 +4992,8 @@ static PyObject *_wrap_Point2D_GetDistance(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetDistance",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4181,7 +5005,7 @@ static PyObject *_wrap_Point2D_GetDistance(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4201,7 +5025,8 @@ static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetDistanceSquare",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4213,7 +5038,7 @@ static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4233,7 +5058,8 @@ static PyObject *_wrap_Point2D_GetDotProduct(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetDotProduct",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4245,7 +5071,7 @@ static PyObject *_wrap_Point2D_GetDotProduct(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4265,7 +5091,8 @@ static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_GetCrossProduct",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4277,7 +5104,7 @@ static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4294,7 +5121,8 @@ static PyObject *_wrap_Point2D___neg__(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D___neg__",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->operator -(); @@ -4305,7 +5133,7 @@ static PyObject *_wrap_Point2D___neg__(PyObject *self, PyObject *args, PyObject { wxPoint2D * resultptr; resultptr = new wxPoint2D((wxPoint2D &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint2D, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint2D, 1); } return resultobj; fail: @@ -4326,7 +5154,8 @@ static PyObject *_wrap_Point2D___iadd__(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___iadd__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4341,7 +5170,7 @@ static PyObject *_wrap_Point2D___iadd__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint2D, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0); return resultobj; fail: return NULL; @@ -4361,7 +5190,8 @@ static PyObject *_wrap_Point2D___isub__(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___isub__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4376,7 +5206,7 @@ static PyObject *_wrap_Point2D___isub__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint2D, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0); return resultobj; fail: return NULL; @@ -4396,7 +5226,8 @@ static PyObject *_wrap_Point2D___imul__(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___imul__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4411,7 +5242,7 @@ static PyObject *_wrap_Point2D___imul__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint2D, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0); return resultobj; fail: return NULL; @@ -4431,7 +5262,8 @@ static PyObject *_wrap_Point2D___idiv__(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___idiv__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4446,7 +5278,7 @@ static PyObject *_wrap_Point2D___idiv__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint2D, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0); return resultobj; fail: return NULL; @@ -4466,7 +5298,8 @@ static PyObject *_wrap_Point2D___eq__(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4478,7 +5311,9 @@ static PyObject *_wrap_Point2D___eq__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4498,7 +5333,8 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail; @@ -4510,87 +5346,9 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Point2D_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double arg2 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_x", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_m_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1) (arg1)->m_x = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Point2D_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_m_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (double) ((arg1)->m_x); - - resultobj = PyFloat_FromDouble(result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Point2D_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double arg2 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_y", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_m_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1) (arg1)->m_y = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Point2D_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_m_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (double) ((arg1)->m_y); - - resultobj = PyFloat_FromDouble(result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4602,12 +5360,16 @@ static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *k wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_x_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4627,10 +5389,11 @@ static PyObject *_wrap_Point2D_x_get(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->m_x); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4642,12 +5405,16 @@ static PyObject *_wrap_Point2D_y_set(PyObject *self, PyObject *args, PyObject *k wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_y_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4667,10 +5434,11 @@ static PyObject *_wrap_Point2D_y_get(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->m_y); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4683,12 +5451,23 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa double arg2 = (double) 0 ; double arg3 = (double) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|dd:Point2D_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Point2D_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPoint2D_Set(arg1,arg2,arg3); @@ -4703,7 +5482,7 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_Point2D_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Point2D_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPoint2D *arg1 = (wxPoint2D *) 0 ; PyObject *result; @@ -4712,11 +5491,12 @@ static PyObject *_wrap_Point2D_asTuple(PyObject *self, PyObject *args, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_asTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_Get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPoint2D_asTuple(arg1); + result = (PyObject *)wxPoint2D_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4744,7 +5524,7 @@ static int _wrap_DefaultPosition_set(PyObject *_val) { static PyObject *_wrap_DefaultPosition_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) &wxDefaultPosition, SWIGTYPE_p_wxPoint, 0); + pyobj = SWIG_NewPointerObj((void *)(&wxDefaultPosition), SWIGTYPE_p_wxPoint, 0); return pyobj; } @@ -4758,7 +5538,7 @@ static int _wrap_DefaultSize_set(PyObject *_val) { static PyObject *_wrap_DefaultSize_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) &wxDefaultSize, SWIGTYPE_p_wxSize, 0); + pyobj = SWIG_NewPointerObj((void *)(&wxDefaultSize), SWIGTYPE_p_wxSize, 0); return pyobj; } @@ -4781,7 +5561,7 @@ static PyObject *_wrap_new_InputStream(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyInputStream, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyInputStream, 1); return resultobj; fail: return NULL; @@ -4797,7 +5577,8 @@ static PyObject *_wrap_InputStream_close(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_close",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->close(); @@ -4821,7 +5602,8 @@ static PyObject *_wrap_InputStream_flush(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_flush",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->flush(); @@ -4846,7 +5628,8 @@ static PyObject *_wrap_InputStream_eof(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_eof",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->eof(); @@ -4854,7 +5637,9 @@ static PyObject *_wrap_InputStream_eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4867,12 +5652,18 @@ static PyObject *_wrap_InputStream_read(PyObject *self, PyObject *args, PyObject int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "size", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_read",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_read",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->read(arg2); @@ -4893,12 +5684,18 @@ static PyObject *_wrap_InputStream_readline(PyObject *self, PyObject *args, PyOb int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "size", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_readline",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_readline",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->readline(arg2); @@ -4919,12 +5716,18 @@ static PyObject *_wrap_InputStream_readlines(PyObject *self, PyObject *args, PyO int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sizehint", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_readlines",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_readlines",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->readlines(arg2); @@ -4945,12 +5748,21 @@ static PyObject *_wrap_InputStream_seek(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "offset",(char *) "whence", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:InputStream_seek",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_seek",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->seek(arg2,arg3); @@ -4975,7 +5787,8 @@ static PyObject *_wrap_InputStream_tell(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_tell",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->tell(); @@ -4983,7 +5796,7 @@ static PyObject *_wrap_InputStream_tell(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -5000,7 +5813,8 @@ static PyObject *_wrap_InputStream_Peek(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_Peek",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (char)(arg1)->Peek(); @@ -5008,7 +5822,7 @@ static PyObject *_wrap_InputStream_Peek(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = Py_BuildValue((char*)"c",result); + resultobj = SWIG_FromChar((char)result); return resultobj; fail: return NULL; @@ -5025,7 +5839,8 @@ static PyObject *_wrap_InputStream_GetC(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_GetC",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (char)(arg1)->GetC(); @@ -5033,7 +5848,7 @@ static PyObject *_wrap_InputStream_GetC(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = Py_BuildValue((char*)"c",result); + resultobj = SWIG_FromChar((char)result); return resultobj; fail: return NULL; @@ -5050,7 +5865,8 @@ static PyObject *_wrap_InputStream_LastRead(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_LastRead",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (size_t)(arg1)->LastRead(); @@ -5058,7 +5874,7 @@ static PyObject *_wrap_InputStream_LastRead(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -5075,7 +5891,8 @@ static PyObject *_wrap_InputStream_CanRead(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_CanRead",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->CanRead(); @@ -5083,7 +5900,9 @@ static PyObject *_wrap_InputStream_CanRead(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5100,7 +5919,8 @@ static PyObject *_wrap_InputStream_Eof(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_Eof",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Eof(); @@ -5108,7 +5928,9 @@ static PyObject *_wrap_InputStream_Eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5121,12 +5943,16 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj char arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "c", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oc:InputStream_Ungetch",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:InputStream_Ungetch",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (char) SWIG_AsChar(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Ungetch(arg2); @@ -5134,7 +5960,9 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5148,12 +5976,21 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec int arg3 = (int) wxFromStart ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|i:InputStream_SeekI",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_SeekI",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (wxSeekMode) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->SeekI(arg2,(wxSeekMode )arg3); @@ -5161,7 +5998,7 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -5178,7 +6015,8 @@ static PyObject *_wrap_InputStream_TellI(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:InputStream_TellI",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->TellI(); @@ -5186,7 +6024,7 @@ static PyObject *_wrap_InputStream_TellI(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -5211,7 +6049,8 @@ static PyObject *_wrap_OutputStream_write(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:OutputStream_write",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOutputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOutputStream, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5244,9 +6083,9 @@ static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwar wxFSFile *result; wxPyInputStream *temp1 ; bool created1 ; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; wxDateTime *argp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -5261,34 +6100,35 @@ static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwar { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } - if ((SWIG_ConvertPtr(obj4,(void **) &argp5, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg5 = *argp5; + if ((SWIG_ConvertPtr(obj4,(void **)(&argp5),SWIGTYPE_p_wxDateTime, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg5 = *argp5; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFSFile *)new wxFSFile(arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,arg5); @@ -5346,7 +6186,8 @@ static PyObject *_wrap_delete_FSFile(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FSFile",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFSFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFSFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -5371,7 +6212,8 @@ static PyObject *_wrap_FSFile_GetStream(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetStream",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFSFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFSFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxInputStream *)(arg1)->GetStream(); @@ -5385,7 +6227,7 @@ static PyObject *_wrap_FSFile_GetStream(PyObject *self, PyObject *args, PyObject if (result) { _ptr = new wxPyInputStream(result); } - resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true); + resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), True); } return resultobj; fail: @@ -5403,7 +6245,8 @@ static PyObject *_wrap_FSFile_GetMimeType(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetMimeType",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFSFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFSFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -5414,7 +6257,13 @@ static PyObject *_wrap_FSFile_GetMimeType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5431,7 +6280,8 @@ static PyObject *_wrap_FSFile_GetLocation(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetLocation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFSFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFSFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -5442,7 +6292,13 @@ static PyObject *_wrap_FSFile_GetLocation(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5459,7 +6315,8 @@ static PyObject *_wrap_FSFile_GetAnchor(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetAnchor",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFSFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFSFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -5470,7 +6327,13 @@ static PyObject *_wrap_FSFile_GetAnchor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5487,7 +6350,8 @@ static PyObject *_wrap_FSFile_GetModificationTime(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FSFile_GetModificationTime",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFSFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFSFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetModificationTime(); @@ -5498,7 +6362,7 @@ static PyObject *_wrap_FSFile_GetModificationTime(PyObject *self, PyObject *args { wxDateTime * resultptr; resultptr = new wxDateTime((wxDateTime &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxDateTime, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxDateTime, 1); } return resultobj; fail: @@ -5535,7 +6399,7 @@ static PyObject *_wrap_new_FileSystemHandler(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyFileSystemHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyFileSystemHandler, 1); return resultobj; fail: return NULL; @@ -5555,7 +6419,8 @@ static PyObject *_wrap_FileSystemHandler__setCallbackInfo(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FileSystemHandler__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -5577,7 +6442,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5585,11 +6450,12 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystemHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5598,7 +6464,9 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -5619,7 +6487,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -5628,15 +6496,19 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FileSystemHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5668,19 +6540,25 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileSystemHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystemHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5720,7 +6598,8 @@ static PyObject *_wrap_FileSystemHandler_FindNext(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystemHandler_FindNext",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindNext(); @@ -5746,7 +6625,7 @@ static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *a wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5754,11 +6633,12 @@ static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystemHandler_GetProtocol",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5793,7 +6673,7 @@ static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObjec wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5801,11 +6681,12 @@ static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystemHandler_GetLeftLocation",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5840,7 +6721,7 @@ static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *arg wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5848,11 +6729,12 @@ static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystemHandler_GetAnchor",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5887,7 +6769,7 @@ static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObje wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5895,11 +6777,12 @@ static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystemHandler_GetRightLocation",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5934,7 +6817,7 @@ static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyOb wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5942,11 +6825,12 @@ static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystemHandler_GetMimeTypeFromExt",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6016,7 +6900,8 @@ static PyObject *_wrap_delete_FileSystem(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_FileSystem",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -6035,8 +6920,8 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P PyObject *resultobj; wxFileSystem *arg1 = (wxFileSystem *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) FALSE ; - bool temp2 = false ; + bool arg3 = (bool) False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6045,14 +6930,15 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystem_ChangePathTo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6087,7 +6973,8 @@ static PyObject *_wrap_FileSystem_GetPath(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_GetPath",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPath(); @@ -6113,7 +7000,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj wxFileSystem *arg1 = (wxFileSystem *) 0 ; wxString *arg2 = 0 ; wxFSFile *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6121,11 +7008,12 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileSystem_OpenFile",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6157,19 +7045,25 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileSystem_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystem_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6209,7 +7103,8 @@ static PyObject *_wrap_FileSystem_FindNext(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_FindNext",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindNext(); @@ -6239,7 +7134,8 @@ static PyObject *_wrap_FileSystem_AddHandler(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_AddHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileSystemHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFileSystem::AddHandler(arg1); @@ -6279,7 +7175,7 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename", NULL @@ -6289,7 +7185,7 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6330,7 +7226,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "url", NULL @@ -6340,7 +7236,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6385,7 +7281,7 @@ static PyObject *_wrap_new_InternetFSHandler(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxInternetFSHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxInternetFSHandler, 1); return resultobj; fail: return NULL; @@ -6397,7 +7293,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, wxInternetFSHandler *arg1 = (wxInternetFSHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6405,11 +7301,12 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:InternetFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxInternetFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxInternetFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6418,7 +7315,9 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -6439,7 +7338,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6448,15 +7347,19 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:InternetFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxInternetFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxInternetFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6504,7 +7407,7 @@ static PyObject *_wrap_new_ZipFSHandler(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxZipFSHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxZipFSHandler, 1); return resultobj; fail: return NULL; @@ -6516,7 +7419,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6524,11 +7427,12 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ZipFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxZipFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxZipFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6537,7 +7441,9 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -6558,7 +7464,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6567,15 +7473,19 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ZipFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxZipFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxZipFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6607,19 +7517,25 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:ZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxZipFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxZipFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6659,7 +7575,8 @@ static PyObject *_wrap_ZipFSHandler_FindNext(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ZipFSHandler_FindNext",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxZipFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxZipFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindNext(); @@ -6692,23 +7609,29 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj wxString *arg1 = 0 ; wxImage *arg2 = 0 ; long arg3 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "image",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:__wxMemoryFSHandler_AddFile_wxImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:__wxMemoryFSHandler_AddFile_wxImage",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (long) SWIG_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); __wxMemoryFSHandler_AddFile_wxImage((wxString const &)*arg1,*arg2,arg3); @@ -6736,23 +7659,29 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb wxString *arg1 = 0 ; wxBitmap *arg2 = 0 ; long arg3 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "bitmap",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:__wxMemoryFSHandler_AddFile_wxBitmap",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:__wxMemoryFSHandler_AddFile_wxBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (long) SWIG_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); __wxMemoryFSHandler_AddFile_wxBitmap((wxString const &)*arg1,(wxBitmap const &)*arg2,arg3); @@ -6779,7 +7708,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject PyObject *resultobj; wxString *arg1 = 0 ; PyObject *arg2 = (PyObject *) 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6790,7 +7719,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } arg2 = obj1; { @@ -6830,7 +7759,7 @@ static PyObject *_wrap_new_MemoryFSHandler(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMemoryFSHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMemoryFSHandler, 1); return resultobj; fail: return NULL; @@ -6840,7 +7769,7 @@ static PyObject *_wrap_new_MemoryFSHandler(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename", NULL @@ -6850,7 +7779,7 @@ static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6879,7 +7808,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6887,11 +7816,12 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryFSHandler_CanOpen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMemoryFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMemoryFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6900,7 +7830,9 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -6921,7 +7853,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args, wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6930,15 +7862,19 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MemoryFSHandler_OpenFile",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMemoryFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMemoryFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFileSystem, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6970,19 +7906,25 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args, wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:MemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMemoryFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMemoryFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7022,7 +7964,8 @@ static PyObject *_wrap_MemoryFSHandler_FindNext(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MemoryFSHandler_FindNext",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMemoryFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMemoryFSHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindNext(); @@ -7060,7 +8003,8 @@ static PyObject *_wrap_ImageHandler_GetName(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetName(); @@ -7091,7 +8035,8 @@ static PyObject *_wrap_ImageHandler_GetExtension(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetExtension",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetExtension(); @@ -7122,7 +8067,8 @@ static PyObject *_wrap_ImageHandler_GetType(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetType",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->GetType(); @@ -7130,7 +8076,7 @@ static PyObject *_wrap_ImageHandler_GetType(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -7147,7 +8093,8 @@ static PyObject *_wrap_ImageHandler_GetMimeType(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageHandler_GetMimeType",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetMimeType(); @@ -7173,7 +8120,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7181,11 +8128,12 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_CanRead",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7194,7 +8142,9 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -7213,7 +8163,7 @@ static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7221,11 +8171,12 @@ static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7253,7 +8204,7 @@ static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args, PyObject *resultobj; wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7261,11 +8212,12 @@ static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetExtension",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7294,12 +8246,16 @@ static PyObject *_wrap_ImageHandler_SetType(PyObject *self, PyObject *args, PyOb wxImageHandler *arg1 = (wxImageHandler *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ImageHandler_SetType",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetType",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetType(arg2); @@ -7318,7 +8274,7 @@ static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args, PyObject *resultobj; wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7326,11 +8282,12 @@ static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetMimeType",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7376,7 +8333,7 @@ static PyObject *_wrap_new_ImageHistogram(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImageHistogram, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImageHistogram, 1); return resultobj; fail: return NULL; @@ -7397,11 +8354,11 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail; - arg1 = (unsigned char) PyInt_AsLong(obj0); + arg1 = (unsigned char) SWIG_AsUnsignedChar(obj0); if (PyErr_Occurred()) SWIG_fail; - arg2 = (unsigned char) PyInt_AsLong(obj1); + arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (unsigned char) PyInt_AsLong(obj2); + arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7410,7 +8367,7 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7442,17 +8399,18 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb arg3 = &temp3; arg4 = &temp4; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:ImageHistogram_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHistogram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHistogram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg5 = (unsigned char) PyInt_AsLong(obj1); + arg5 = (unsigned char) SWIG_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - arg6 = (unsigned char) PyInt_AsLong(obj2); + arg6 = (unsigned char) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg7 = (unsigned char) PyInt_AsLong(obj3); + arg7 = (unsigned char) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -7462,7 +8420,9 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -7494,17 +8454,27 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg long arg2 = (long) wxBITMAP_TYPE_ANY ; int arg3 = (int) -1 ; wxImage *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|li:new_Image",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Image",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; + } + if (obj1) { + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7513,7 +8483,7 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { if (temp1) delete arg1; @@ -7537,7 +8507,8 @@ static PyObject *_wrap_delete_Image(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Image",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -7558,24 +8529,29 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec wxString *arg2 = 0 ; int arg3 = (int) -1 ; wxImage *result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "name",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:new_ImageFromMime",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_ImageFromMime",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7584,7 +8560,7 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { if (temp1) delete arg1; @@ -7616,25 +8592,35 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj wxPyInputStream *temp1 ; bool created1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "stream",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|li:new_ImageFromStream",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_ImageFromStream",kwnames,&obj0,&obj1,&obj2)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } + if (obj1) { + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage(*arg1,arg2,arg3); @@ -7642,7 +8628,7 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { if (created1) delete arg1; @@ -7665,32 +8651,37 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P wxImage *result; wxPyInputStream *temp1 ; bool created1 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "stream",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:new_ImageFromStreamMime",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_ImageFromStreamMime",kwnames,&obj0,&obj1,&obj2)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7699,7 +8690,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); { if (created1) delete arg1; @@ -7726,16 +8717,26 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 = (int) 0 ; int arg2 = (int) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; wxImage *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "clear", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_EmptyImage",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_EmptyImage",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -7745,7 +8746,7 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); return resultobj; fail: return NULL; @@ -7762,9 +8763,12 @@ static PyObject *_wrap_new_ImageFromBitmap(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ImageFromBitmap",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7773,7 +8777,7 @@ static PyObject *_wrap_new_ImageFromBitmap(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); return resultobj; fail: return NULL; @@ -7786,13 +8790,20 @@ static PyObject *_wrap_new_ImageFromData(PyObject *self, PyObject *args, PyObjec int arg2 ; unsigned char *arg3 = (unsigned char *) 0 ; wxImage *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiO:new_ImageFromData",kwnames,&arg1,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_ImageFromData",kwnames,&obj0,&obj1,&obj2)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_unsigned_char, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new_wxImage(arg1,arg2,arg3); @@ -7800,7 +8811,7 @@ static PyObject *_wrap_new_ImageFromData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); return resultobj; fail: return NULL; @@ -7813,12 +8824,19 @@ static PyObject *_wrap_Image_Create(PyObject *self, PyObject *args, PyObject *kw int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Create",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Create(arg2,arg3); @@ -7842,7 +8860,8 @@ static PyObject *_wrap_Image_Destroy(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_Destroy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Destroy(); @@ -7864,12 +8883,19 @@ static PyObject *_wrap_Image_Scale(PyObject *self, PyObject *args, PyObject *kwa int arg3 ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Scale",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->Scale(arg2,arg3); @@ -7880,7 +8906,7 @@ static PyObject *_wrap_Image_Scale(PyObject *self, PyObject *args, PyObject *kwa { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -7895,12 +8921,19 @@ static PyObject *_wrap_Image_ShrinkBy(PyObject *self, PyObject *args, PyObject * int arg3 ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xFactor",(char *) "yFactor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_ShrinkBy",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_ShrinkBy",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxImage const *)arg1)->ShrinkBy(arg2,arg3); @@ -7911,7 +8944,7 @@ static PyObject *_wrap_Image_ShrinkBy(PyObject *self, PyObject *args, PyObject * { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -7926,12 +8959,19 @@ static PyObject *_wrap_Image_Rescale(PyObject *self, PyObject *args, PyObject *k int arg3 ; wxImage *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Rescale",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Rescale",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -7942,7 +8982,7 @@ static PyObject *_wrap_Image_Rescale(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxImage, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 0); return resultobj; fail: return NULL; @@ -7958,6 +8998,8 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw unsigned char arg5 ; unsigned char arg6 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; @@ -7965,13 +9007,18 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "x",(char *) "y",(char *) "r",(char *) "g",(char *) "b", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiOOO:Image_SetRGB",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg4 = (unsigned char) PyInt_AsLong(obj3); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Image_SetRGB",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; - arg5 = (unsigned char) PyInt_AsLong(obj4); + arg3 = (int) SWIG_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; - arg6 = (unsigned char) PyInt_AsLong(obj5); + arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (unsigned char) SWIG_AsUnsignedChar(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (unsigned char) SWIG_AsUnsignedChar(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7994,12 +9041,19 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw int arg3 ; unsigned char result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_GetRed",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetRed",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetRed(arg2,arg3); @@ -8007,7 +9061,7 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8021,12 +9075,19 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_GetGreen",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetGreen",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetGreen(arg2,arg3); @@ -8034,7 +9095,7 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8048,12 +9109,19 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k int arg3 ; unsigned char result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_GetBlue",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetBlue",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetBlue(arg2,arg3); @@ -8061,7 +9129,7 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8075,14 +9143,21 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "alpha", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Image_SetAlpha",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg4 = (unsigned char) PyInt_AsLong(obj3); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8105,12 +9180,19 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_GetAlpha",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetAlpha",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetAlpha(arg2,arg3); @@ -8118,7 +9200,7 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8135,7 +9217,8 @@ static PyObject *_wrap_Image_HasAlpha(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HasAlpha",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->HasAlpha(); @@ -8143,7 +9226,9 @@ static PyObject *_wrap_Image_HasAlpha(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8175,17 +9260,18 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg arg3 = &temp3; arg4 = &temp4; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Image_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg5 = (byte) PyInt_AsLong(obj1); + arg5 = (byte) SWIG_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - arg6 = (byte) PyInt_AsLong(obj2); + arg6 = (byte) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg7 = (byte) PyInt_AsLong(obj3); + arg7 = (byte) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -8195,7 +9281,9 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -8232,16 +9320,20 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Image_SetMaskFromImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } - arg3 = (byte) PyInt_AsLong(obj2); + arg3 = (byte) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (byte) PyInt_AsLong(obj3); + arg4 = (byte) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (byte) PyInt_AsLong(obj4); + arg5 = (byte) SWIG_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8250,7 +9342,9 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8261,7 +9355,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxString *arg1 = 0 ; bool result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -8271,7 +9365,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8280,7 +9374,9 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp1) delete arg1; @@ -8300,17 +9396,22 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj wxString *arg1 = 0 ; long arg2 = (long) wxBITMAP_TYPE_ANY ; int result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Image_GetImageCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_GetImageCount",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; + } + if (obj1) { + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8319,7 +9420,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp1) delete arg1; @@ -8341,19 +9442,30 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * long arg3 = (long) wxBITMAP_TYPE_ANY ; int arg4 = (int) -1 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|li:Image_LoadFile",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + arg3 = (long) SWIG_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8362,7 +9474,9 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -8384,26 +9498,32 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje wxString *arg3 = 0 ; int arg4 = (int) -1 ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Image_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8412,7 +9532,9 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -8441,20 +9563,24 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * wxString *arg2 = 0 ; int arg3 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Image_SaveFile",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SaveFile",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SaveFile((wxString const &)*arg2,arg3); @@ -8462,7 +9588,9 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -8483,8 +9611,8 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje wxString *arg2 = 0 ; wxString *arg3 = 0 ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8493,16 +9621,17 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SaveMimeFile",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8511,7 +9640,9 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -8549,15 +9680,15 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } { @@ -8567,7 +9698,9 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (created1) delete arg1; @@ -8593,26 +9726,37 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject bool created2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stream",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|li:Image_LoadStream",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { arg2 = temp2->m_wxis; - created2 = false; + created2 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg2 = wxPyCBInputStream_create(obj1, false); + arg2 = wxPyCBInputStream_create(obj1, False); if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created2 = true; + created2 = True; } } + if (obj2) { + arg3 = (long) SWIG_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile(*arg2,arg3,arg4); @@ -8620,7 +9764,9 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (created2) delete arg2; @@ -8644,34 +9790,40 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb bool result; wxPyInputStream *temp2 ; bool created2 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stream",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Image_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { arg2 = temp2->m_wxis; - created2 = false; + created2 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg2 = wxPyCBInputStream_create(obj1, false); + arg2 = wxPyCBInputStream_create(obj1, False); if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created2 = true; + created2 = True; } } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8680,7 +9832,9 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (created2) delete arg2; @@ -8713,7 +9867,8 @@ static PyObject *_wrap_Image_Ok(PyObject *self, PyObject *args, PyObject *kwargs }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_Ok",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Ok(); @@ -8721,7 +9876,9 @@ static PyObject *_wrap_Image_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8738,7 +9895,8 @@ static PyObject *_wrap_Image_GetWidth(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetWidth(); @@ -8746,7 +9904,7 @@ static PyObject *_wrap_Image_GetWidth(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -8763,7 +9921,8 @@ static PyObject *_wrap_Image_GetHeight(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetHeight(); @@ -8771,7 +9930,7 @@ static PyObject *_wrap_Image_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -8791,7 +9950,8 @@ static PyObject *_wrap_Image_GetSubImage(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_GetSubImage",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -8806,7 +9966,7 @@ static PyObject *_wrap_Image_GetSubImage(PyObject *self, PyObject *args, PyObjec { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -8824,7 +9984,8 @@ static PyObject *_wrap_Image_Copy(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_Copy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->Copy(); @@ -8835,7 +9996,7 @@ static PyObject *_wrap_Image_Copy(PyObject *self, PyObject *args, PyObject *kwar { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -8851,16 +10012,26 @@ static PyObject *_wrap_Image_Paste(PyObject *self, PyObject *args, PyObject *kwa int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:Image_Paste",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_Paste",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Paste((wxImage const &)*arg2,arg3,arg4); @@ -8885,7 +10056,8 @@ static PyObject *_wrap_Image_GetData(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetData",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxImage_GetData(arg1); @@ -8911,7 +10083,8 @@ static PyObject *_wrap_Image_SetData(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetData",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8937,7 +10110,8 @@ static PyObject *_wrap_Image_GetDataBuffer(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetDataBuffer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxImage_GetDataBuffer(arg1); @@ -8963,7 +10137,8 @@ static PyObject *_wrap_Image_SetDataBuffer(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetDataBuffer",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8989,7 +10164,8 @@ static PyObject *_wrap_Image_GetAlphaData(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetAlphaData",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxImage_GetAlphaData(arg1); @@ -9015,7 +10191,8 @@ static PyObject *_wrap_Image_SetAlphaData(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetAlphaData",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9041,7 +10218,8 @@ static PyObject *_wrap_Image_GetAlphaBuffer(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetAlphaBuffer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxImage_GetAlphaBuffer(arg1); @@ -9067,7 +10245,8 @@ static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetAlphaBuffer",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9098,12 +10277,13 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetMaskColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (unsigned char) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (unsigned char) PyInt_AsLong(obj2); + arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (unsigned char) PyInt_AsLong(obj3); + arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9129,7 +10309,8 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetMaskRed",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetMaskRed(); @@ -9137,7 +10318,7 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9154,7 +10335,8 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetMaskGreen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetMaskGreen(); @@ -9162,7 +10344,7 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9179,7 +10361,8 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetMaskBlue",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetMaskBlue(); @@ -9187,7 +10370,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9197,7 +10380,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9205,9 +10388,10 @@ static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_SetMask",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9234,7 +10418,8 @@ static PyObject *_wrap_Image_HasMask(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HasMask",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->HasMask(); @@ -9242,7 +10427,9 @@ static PyObject *_wrap_Image_HasMask(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9254,11 +10441,12 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw wxImage *arg1 = (wxImage *) 0 ; double arg2 ; wxPoint *arg3 = 0 ; - bool arg4 = (bool) TRUE ; + bool arg4 = (bool) True ; wxPoint *arg5 = (wxPoint *) NULL ; SwigValueWrapper< wxImage > result; wxPoint temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -9266,18 +10454,22 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "angle",(char *) "centre_of_rotation",(char *) "interpolating",(char *) "offset_after_rotation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO|OO:Image_Rotate",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Image_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; + arg4 = (bool) SWIG_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9289,7 +10481,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -9300,7 +10492,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9309,9 +10501,10 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_Rotate90",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9324,7 +10517,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject * { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -9335,7 +10528,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9344,9 +10537,10 @@ static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_Mirror",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9359,7 +10553,7 @@ static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kw { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -9388,18 +10582,19 @@ static PyObject *_wrap_Image_Replace(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:Image_Replace",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (unsigned char) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (unsigned char) PyInt_AsLong(obj2); + arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (unsigned char) PyInt_AsLong(obj3); + arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (unsigned char) PyInt_AsLong(obj4); + arg5 = (unsigned char) SWIG_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (unsigned char) PyInt_AsLong(obj5); + arg6 = (unsigned char) SWIG_AsUnsignedChar(obj5); if (PyErr_Occurred()) SWIG_fail; - arg7 = (unsigned char) PyInt_AsLong(obj6); + arg7 = (unsigned char) SWIG_AsUnsignedChar(obj6); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9431,12 +10626,13 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMono",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (unsigned char) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (unsigned char) PyInt_AsLong(obj2); + arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (unsigned char) PyInt_AsLong(obj3); + arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9448,7 +10644,7 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *self, PyObject *args, PyObj { wxImage * resultptr; resultptr = new wxImage((wxImage &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxImage, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage, 1); } return resultobj; fail: @@ -9461,8 +10657,8 @@ static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; wxString *arg3 = 0 ; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9471,16 +10667,17 @@ static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SetOption",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9517,20 +10714,24 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; int arg3 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Image_SetOptionInt",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SetOptionInt",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOption((wxString const &)*arg2,arg3); @@ -9558,7 +10759,7 @@ static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9566,11 +10767,12 @@ static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_GetOption",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9605,7 +10807,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9613,11 +10815,12 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_GetOptionInt",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9626,7 +10829,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -9646,7 +10849,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9654,11 +10857,12 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_HasOption",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9667,7 +10871,9 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -9694,9 +10900,10 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_CountColours",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (unsigned long) PyInt_AsLong(obj1); + arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9706,7 +10913,7 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -9725,10 +10932,14 @@ static PyObject *_wrap_Image_ComputeHistogram(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_ComputeHistogram",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageHistogram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxImageHistogram, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9737,7 +10948,7 @@ static PyObject *_wrap_Image_ComputeHistogram(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -9753,7 +10964,8 @@ static PyObject *_wrap_Image_AddHandler(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_AddHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxImage::AddHandler(arg1); @@ -9777,7 +10989,8 @@ static PyObject *_wrap_Image_InsertHandler(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_InsertHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxImage::InsertHandler(arg1); @@ -9796,7 +11009,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxString *arg1 = 0 ; bool result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -9806,7 +11019,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9815,7 +11028,9 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp1) delete arg1; @@ -9868,7 +11083,8 @@ static PyObject *_wrap_Image_ConvertToBitmap(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_ConvertToBitmap",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxImage_ConvertToBitmap(arg1); @@ -9879,7 +11095,7 @@ static PyObject *_wrap_Image_ConvertToBitmap(PyObject *self, PyObject *args, PyO { wxBitmap * resultptr; resultptr = new wxBitmap((wxBitmap &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxBitmap, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBitmap, 1); } return resultobj; fail: @@ -9903,12 +11119,13 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMonoBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (unsigned char) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (unsigned char) PyInt_AsLong(obj2); + arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (unsigned char) PyInt_AsLong(obj3); + arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9920,7 +11137,7 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *self, PyObject *args, { wxBitmap * resultptr; resultptr = new wxBitmap((wxBitmap &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxBitmap, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBitmap, 1); } return resultobj; fail: @@ -9965,7 +11182,7 @@ static int _wrap_NullImage_set(PyObject *_val) { static PyObject *_wrap_NullImage_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) &wxNullImage, SWIGTYPE_p_wxImage, 0); + pyobj = SWIG_NewPointerObj((void *)(&wxNullImage), SWIGTYPE_p_wxImage, 0); return pyobj; } @@ -10085,7 +11302,7 @@ static PyObject *_wrap_new_BMPHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBMPHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBMPHandler, 1); return resultobj; fail: return NULL; @@ -10114,7 +11331,7 @@ static PyObject *_wrap_new_ICOHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxICOHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxICOHandler, 1); return resultobj; fail: return NULL; @@ -10143,7 +11360,7 @@ static PyObject *_wrap_new_CURHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCURHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCURHandler, 1); return resultobj; fail: return NULL; @@ -10172,7 +11389,7 @@ static PyObject *_wrap_new_ANIHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxANIHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxANIHandler, 1); return resultobj; fail: return NULL; @@ -10201,7 +11418,7 @@ static PyObject *_wrap_new_PNGHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPNGHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPNGHandler, 1); return resultobj; fail: return NULL; @@ -10230,7 +11447,7 @@ static PyObject *_wrap_new_GIFHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGIFHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGIFHandler, 1); return resultobj; fail: return NULL; @@ -10259,7 +11476,7 @@ static PyObject *_wrap_new_PCXHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPCXHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPCXHandler, 1); return resultobj; fail: return NULL; @@ -10288,7 +11505,7 @@ static PyObject *_wrap_new_JPEGHandler(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxJPEGHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxJPEGHandler, 1); return resultobj; fail: return NULL; @@ -10317,7 +11534,7 @@ static PyObject *_wrap_new_PNMHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPNMHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPNMHandler, 1); return resultobj; fail: return NULL; @@ -10346,7 +11563,7 @@ static PyObject *_wrap_new_XPMHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxXPMHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxXPMHandler, 1); return resultobj; fail: return NULL; @@ -10375,7 +11592,7 @@ static PyObject *_wrap_new_TIFFHandler(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxTIFFHandler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTIFFHandler, 1); return resultobj; fail: return NULL; @@ -10423,7 +11640,8 @@ static PyObject *_wrap_EvtHandler_GetNextHandler(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_GetNextHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxEvtHandler *)(arg1)->GetNextHandler(); @@ -10450,7 +11668,8 @@ static PyObject *_wrap_EvtHandler_GetPreviousHandler(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_GetPreviousHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxEvtHandler *)(arg1)->GetPreviousHandler(); @@ -10478,8 +11697,10 @@ static PyObject *_wrap_EvtHandler_SetNextHandler(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetNextHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNextHandler(arg2); @@ -10505,8 +11726,10 @@ static PyObject *_wrap_EvtHandler_SetPreviousHandler(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetPreviousHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPreviousHandler(arg2); @@ -10531,7 +11754,8 @@ static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_GetEvtHandlerEnabled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetEvtHandlerEnabled(); @@ -10539,7 +11763,9 @@ static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -10557,8 +11783,9 @@ static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetEvtHandlerEnabled",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10586,10 +11813,14 @@ static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_ProcessEvent",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10598,7 +11829,9 @@ static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -10616,10 +11849,14 @@ static PyObject *_wrap_EvtHandler_AddPendingEvent(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_AddPendingEvent",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10644,7 +11881,8 @@ static PyObject *_wrap_EvtHandler_ProcessPendingEvents(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EvtHandler_ProcessPendingEvents",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ProcessPendingEvents(); @@ -10667,13 +11905,23 @@ static PyObject *_wrap_EvtHandler_Connect(PyObject *self, PyObject *args, PyObje int arg4 ; PyObject *arg5 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType",(char *) "func", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:EvtHandler_Connect",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:EvtHandler_Connect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; arg5 = obj4; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10697,12 +11945,26 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO wxEventType arg4 = (wxEventType) wxEVT_NULL ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:EvtHandler_Disconnect",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:EvtHandler_Disconnect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (wxEventType) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxEvtHandler_Disconnect(arg1,arg2,arg3,arg4); @@ -10710,7 +11972,9 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -10728,7 +11992,8 @@ static PyObject *_wrap_EvtHandler__setOORInfo(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler__setOORInfo",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10766,7 +12031,7 @@ static PyObject *_wrap_NewEventType(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -10782,7 +12047,8 @@ static PyObject *_wrap_delete_Event(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Event",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -10802,12 +12068,16 @@ static PyObject *_wrap_Event_SetEventType(PyObject *self, PyObject *args, PyObje wxEvent *arg1 = (wxEvent *) 0 ; wxEventType arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "typ", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_SetEventType",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetEventType",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (wxEventType) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEventType(arg2); @@ -10832,7 +12102,8 @@ static PyObject *_wrap_Event_GetEventType(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetEventType",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxEventType)((wxEvent const *)arg1)->GetEventType(); @@ -10840,7 +12111,7 @@ static PyObject *_wrap_Event_GetEventType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -10857,7 +12128,8 @@ static PyObject *_wrap_Event_GetEventObject(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetEventObject",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxObject *)((wxEvent const *)arg1)->GetEventObject(); @@ -10885,8 +12157,10 @@ static PyObject *_wrap_Event_SetEventObject(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetEventObject",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEventObject(arg2); @@ -10911,7 +12185,8 @@ static PyObject *_wrap_Event_GetTimestamp(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetTimestamp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxEvent const *)arg1)->GetTimestamp(); @@ -10919,7 +12194,7 @@ static PyObject *_wrap_Event_GetTimestamp(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -10931,12 +12206,18 @@ static PyObject *_wrap_Event_SetTimestamp(PyObject *self, PyObject *args, PyObje wxEvent *arg1 = (wxEvent *) 0 ; long arg2 = (long) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ts", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Event_SetTimestamp",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Event_SetTimestamp",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTimestamp(arg2); @@ -10961,7 +12242,8 @@ static PyObject *_wrap_Event_GetId(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetId",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxEvent const *)arg1)->GetId(); @@ -10969,7 +12251,7 @@ static PyObject *_wrap_Event_GetId(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -10981,12 +12263,16 @@ static PyObject *_wrap_Event_SetId(PyObject *self, PyObject *args, PyObject *kwa wxEvent *arg1 = (wxEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_SetId",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetId",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -11011,7 +12297,8 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_IsCommandEvent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxEvent const *)arg1)->IsCommandEvent(); @@ -11019,7 +12306,9 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11029,7 +12318,7 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEvent *arg1 = (wxEvent *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11037,9 +12326,10 @@ static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Event_Skip",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11066,7 +12356,8 @@ static PyObject *_wrap_Event_GetSkipped(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_GetSkipped",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxEvent const *)arg1)->GetSkipped(); @@ -11074,7 +12365,9 @@ static PyObject *_wrap_Event_GetSkipped(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11091,7 +12384,8 @@ static PyObject *_wrap_Event_ShouldPropagate(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_ShouldPropagate",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxEvent const *)arg1)->ShouldPropagate(); @@ -11099,7 +12393,9 @@ static PyObject *_wrap_Event_ShouldPropagate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11116,7 +12412,8 @@ static PyObject *_wrap_Event_StopPropagation(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_StopPropagation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->StopPropagation(); @@ -11124,7 +12421,7 @@ static PyObject *_wrap_Event_StopPropagation(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -11136,12 +12433,16 @@ static PyObject *_wrap_Event_ResumePropagation(PyObject *self, PyObject *args, P wxEvent *arg1 = (wxEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "propagationLevel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_ResumePropagation",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_ResumePropagation",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ResumePropagation(arg2); @@ -11166,7 +12467,8 @@ static PyObject *_wrap_Event_Clone(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Event_Clone",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxEvent *)(arg1)->Clone(); @@ -11174,7 +12476,7 @@ static PyObject *_wrap_Event_Clone(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEvent, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvent, 0); return resultobj; fail: return NULL; @@ -11198,9 +12500,12 @@ static PyObject *_wrap_new_PropagationDisabler(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PropagationDisabler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11209,7 +12514,7 @@ static PyObject *_wrap_new_PropagationDisabler(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPropagationDisabler, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPropagationDisabler, 1); return resultobj; fail: return NULL; @@ -11225,7 +12530,8 @@ static PyObject *_wrap_delete_PropagationDisabler(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PropagationDisabler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPropagationDisabler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPropagationDisabler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -11257,9 +12563,12 @@ static PyObject *_wrap_new_PropagateOnce(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PropagateOnce",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11268,7 +12577,7 @@ static PyObject *_wrap_new_PropagateOnce(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPropagateOnce, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPropagateOnce, 1); return resultobj; fail: return NULL; @@ -11284,7 +12593,8 @@ static PyObject *_wrap_delete_PropagateOnce(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PropagateOnce",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPropagateOnce,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPropagateOnce, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -11311,11 +12621,21 @@ static PyObject *_wrap_new_CommandEvent(PyObject *self, PyObject *args, PyObject wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxCommandEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_CommandEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CommandEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCommandEvent *)new wxCommandEvent(arg1,arg2); @@ -11323,7 +12643,7 @@ static PyObject *_wrap_new_CommandEvent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCommandEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCommandEvent, 1); return resultobj; fail: return NULL; @@ -11340,7 +12660,8 @@ static PyObject *_wrap_CommandEvent_GetSelection(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetSelection",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxCommandEvent const *)arg1)->GetSelection(); @@ -11348,7 +12669,7 @@ static PyObject *_wrap_CommandEvent_GetSelection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -11359,7 +12680,7 @@ static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, Py PyObject *resultobj; wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11367,11 +12688,12 @@ static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetString",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11405,7 +12727,8 @@ static PyObject *_wrap_CommandEvent_GetString(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetString",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxCommandEvent const *)arg1)->GetString(); @@ -11436,7 +12759,8 @@ static PyObject *_wrap_CommandEvent_IsChecked(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_IsChecked",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxCommandEvent const *)arg1)->IsChecked(); @@ -11444,7 +12768,9 @@ static PyObject *_wrap_CommandEvent_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11461,7 +12787,8 @@ static PyObject *_wrap_CommandEvent_IsSelection(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_IsSelection",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxCommandEvent const *)arg1)->IsSelection(); @@ -11469,7 +12796,9 @@ static PyObject *_wrap_CommandEvent_IsSelection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11481,12 +12810,16 @@ static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *self, PyObject *args, wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "extraLong", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:CommandEvent_SetExtraLong",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetExtraLong",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraLong(arg2); @@ -11511,7 +12844,8 @@ static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetExtraLong",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxCommandEvent const *)arg1)->GetExtraLong(); @@ -11519,7 +12853,7 @@ static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -11531,12 +12865,16 @@ static PyObject *_wrap_CommandEvent_SetInt(PyObject *self, PyObject *args, PyObj wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CommandEvent_SetInt",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetInt",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInt(arg2); @@ -11561,7 +12899,8 @@ static PyObject *_wrap_CommandEvent_GetInt(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_GetInt",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxCommandEvent const *)arg1)->GetInt(); @@ -11569,7 +12908,7 @@ static PyObject *_wrap_CommandEvent_GetInt(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -11586,7 +12925,8 @@ static PyObject *_wrap_CommandEvent_Clone(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CommandEvent_Clone",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxEvent *)((wxCommandEvent const *)arg1)->Clone(); @@ -11594,7 +12934,7 @@ static PyObject *_wrap_CommandEvent_Clone(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEvent, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvent, 0); return resultobj; fail: return NULL; @@ -11613,11 +12953,21 @@ static PyObject *_wrap_new_NotifyEvent(PyObject *self, PyObject *args, PyObject wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxNotifyEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_NotifyEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_NotifyEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNotifyEvent *)new wxNotifyEvent(arg1,arg2); @@ -11625,7 +12975,7 @@ static PyObject *_wrap_new_NotifyEvent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxNotifyEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotifyEvent, 1); return resultobj; fail: return NULL; @@ -11641,7 +12991,8 @@ static PyObject *_wrap_NotifyEvent_Veto(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotifyEvent_Veto",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNotifyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNotifyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Veto(); @@ -11665,7 +13016,8 @@ static PyObject *_wrap_NotifyEvent_Allow(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotifyEvent_Allow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNotifyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNotifyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Allow(); @@ -11690,7 +13042,8 @@ static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotifyEvent_IsAllowed",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNotifyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNotifyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsAllowed(); @@ -11698,7 +13051,9 @@ static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11719,11 +13074,31 @@ static PyObject *_wrap_new_ScrollEvent(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxScrollEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid",(char *) "pos",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_ScrollEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ScrollEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxScrollEvent *)new wxScrollEvent(arg1,arg2,arg3,arg4); @@ -11731,7 +13106,7 @@ static PyObject *_wrap_new_ScrollEvent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxScrollEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrollEvent, 1); return resultobj; fail: return NULL; @@ -11748,7 +13123,8 @@ static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollEvent_GetOrientation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxScrollEvent const *)arg1)->GetOrientation(); @@ -11756,7 +13132,7 @@ static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -11773,7 +13149,8 @@ static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollEvent_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxScrollEvent const *)arg1)->GetPosition(); @@ -11781,7 +13158,7 @@ static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -11793,12 +13170,16 @@ static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *self, PyObject *args wxScrollEvent *arg1 = (wxScrollEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -11818,12 +13199,16 @@ static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *self, PyObject *args, P wxScrollEvent *arg1 = (wxScrollEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -11851,11 +13236,26 @@ static PyObject *_wrap_new_ScrollWinEvent(PyObject *self, PyObject *args, PyObje int arg2 = (int) 0 ; int arg3 = (int) 0 ; wxScrollWinEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "pos",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iii:new_ScrollWinEvent",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ScrollWinEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxScrollWinEvent *)new wxScrollWinEvent(arg1,arg2,arg3); @@ -11863,7 +13263,7 @@ static PyObject *_wrap_new_ScrollWinEvent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxScrollWinEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrollWinEvent, 1); return resultobj; fail: return NULL; @@ -11880,7 +13280,8 @@ static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollWinEvent_GetOrientation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollWinEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxScrollWinEvent const *)arg1)->GetOrientation(); @@ -11888,7 +13289,7 @@ static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -11905,7 +13306,8 @@ static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrollWinEvent_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollWinEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxScrollWinEvent const *)arg1)->GetPosition(); @@ -11913,7 +13315,7 @@ static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -11925,12 +13327,16 @@ static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *self, PyObject *a wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollWinEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollWinEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -11950,12 +13356,16 @@ static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *self, PyObject *args wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollWinEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollWinEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -11981,11 +13391,16 @@ static PyObject *_wrap_new_MouseEvent(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxMouseEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mouseType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_MouseEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MouseEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMouseEvent *)new wxMouseEvent(arg1); @@ -12012,7 +13427,8 @@ static PyObject *_wrap_MouseEvent_IsButton(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_IsButton",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->IsButton(); @@ -12020,7 +13436,9 @@ static PyObject *_wrap_MouseEvent_IsButton(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12033,12 +13451,18 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonDown",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDown",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonDown(arg2); @@ -12046,7 +13470,9 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12059,12 +13485,18 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonDClick",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDClick",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonDClick(arg2); @@ -12072,7 +13504,9 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12085,12 +13519,18 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonUp",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonUp",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonUp(arg2); @@ -12098,7 +13538,9 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12111,12 +13553,16 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_Button",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_Button",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->Button(arg2); @@ -12124,7 +13570,9 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12137,12 +13585,16 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_ButtonIsDown",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonIsDown(arg2); @@ -12150,7 +13602,9 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12167,7 +13621,8 @@ static PyObject *_wrap_MouseEvent_GetButton(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetButton",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxMouseEvent const *)arg1)->GetButton(); @@ -12175,7 +13630,7 @@ static PyObject *_wrap_MouseEvent_GetButton(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12192,7 +13647,8 @@ static PyObject *_wrap_MouseEvent_ControlDown(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_ControlDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ControlDown(); @@ -12200,7 +13656,9 @@ static PyObject *_wrap_MouseEvent_ControlDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12217,7 +13675,8 @@ static PyObject *_wrap_MouseEvent_MetaDown(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MetaDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->MetaDown(); @@ -12225,7 +13684,9 @@ static PyObject *_wrap_MouseEvent_MetaDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12242,7 +13703,8 @@ static PyObject *_wrap_MouseEvent_AltDown(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_AltDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->AltDown(); @@ -12250,7 +13712,9 @@ static PyObject *_wrap_MouseEvent_AltDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12267,7 +13731,8 @@ static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_ShiftDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ShiftDown(); @@ -12275,7 +13740,9 @@ static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12292,7 +13759,8 @@ static PyObject *_wrap_MouseEvent_LeftDown(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->LeftDown(); @@ -12300,7 +13768,9 @@ static PyObject *_wrap_MouseEvent_LeftDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12317,7 +13787,8 @@ static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->MiddleDown(); @@ -12325,7 +13796,9 @@ static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12342,7 +13815,8 @@ static PyObject *_wrap_MouseEvent_RightDown(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->RightDown(); @@ -12350,7 +13824,9 @@ static PyObject *_wrap_MouseEvent_RightDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12367,7 +13843,8 @@ static PyObject *_wrap_MouseEvent_LeftUp(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftUp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->LeftUp(); @@ -12375,7 +13852,9 @@ static PyObject *_wrap_MouseEvent_LeftUp(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12392,7 +13871,8 @@ static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleUp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->MiddleUp(); @@ -12400,7 +13880,9 @@ static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12417,7 +13899,8 @@ static PyObject *_wrap_MouseEvent_RightUp(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightUp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->RightUp(); @@ -12425,7 +13908,9 @@ static PyObject *_wrap_MouseEvent_RightUp(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12442,7 +13927,8 @@ static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftDClick",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->LeftDClick(); @@ -12450,7 +13936,9 @@ static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12467,7 +13955,8 @@ static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleDClick",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->MiddleDClick(); @@ -12475,7 +13964,9 @@ static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12492,7 +13983,8 @@ static PyObject *_wrap_MouseEvent_RightDClick(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightDClick",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->RightDClick(); @@ -12500,7 +13992,9 @@ static PyObject *_wrap_MouseEvent_RightDClick(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12517,7 +14011,8 @@ static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_LeftIsDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LeftIsDown(); @@ -12525,7 +14020,9 @@ static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12542,7 +14039,8 @@ static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_MiddleIsDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->MiddleIsDown(); @@ -12550,7 +14048,9 @@ static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12567,7 +14067,8 @@ static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_RightIsDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->RightIsDown(); @@ -12575,7 +14076,9 @@ static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12592,7 +14095,8 @@ static PyObject *_wrap_MouseEvent_Dragging(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Dragging",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->Dragging(); @@ -12600,7 +14104,9 @@ static PyObject *_wrap_MouseEvent_Dragging(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12617,7 +14123,8 @@ static PyObject *_wrap_MouseEvent_Moving(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Moving",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->Moving(); @@ -12625,7 +14132,9 @@ static PyObject *_wrap_MouseEvent_Moving(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12642,7 +14151,8 @@ static PyObject *_wrap_MouseEvent_Entering(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Entering",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->Entering(); @@ -12650,7 +14160,9 @@ static PyObject *_wrap_MouseEvent_Entering(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12667,7 +14179,8 @@ static PyObject *_wrap_MouseEvent_Leaving(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_Leaving",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->Leaving(); @@ -12675,7 +14188,9 @@ static PyObject *_wrap_MouseEvent_Leaving(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12692,7 +14207,8 @@ static PyObject *_wrap_MouseEvent_GetPosition(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPosition(); @@ -12703,7 +14219,7 @@ static PyObject *_wrap_MouseEvent_GetPosition(PyObject *self, PyObject *args, Py { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -12726,7 +14242,8 @@ static PyObject *_wrap_MouseEvent_GetPositionTuple(PyObject *self, PyObject *arg arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetPositionTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetPosition(arg2,arg3); @@ -12761,10 +14278,14 @@ static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_GetLogicalPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12776,7 +14297,7 @@ static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *self, PyObject *a { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -12787,22 +14308,23 @@ static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *self, PyObject *a static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetX",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxMouseEvent const *)arg1)->GetX(); + result = (int)((wxMouseEvent const *)arg1)->GetX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12812,22 +14334,23 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetY",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxMouseEvent const *)arg1)->GetY(); + result = (int)((wxMouseEvent const *)arg1)->GetY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12844,7 +14367,8 @@ static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetWheelRotation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxMouseEvent const *)arg1)->GetWheelRotation(); @@ -12852,7 +14376,7 @@ static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12869,7 +14393,8 @@ static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetWheelDelta",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxMouseEvent const *)arg1)->GetWheelDelta(); @@ -12877,7 +14402,7 @@ static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12894,7 +14419,8 @@ static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetLinesPerAction",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxMouseEvent const *)arg1)->GetLinesPerAction(); @@ -12902,7 +14428,7 @@ static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12919,7 +14445,8 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_IsPageScroll",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->IsPageScroll(); @@ -12927,7 +14454,9 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12937,14 +14466,18 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -12957,17 +14490,18 @@ static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_x); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (int) ((arg1)->m_x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12977,14 +14511,18 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -12997,17 +14535,18 @@ static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_y); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (int) ((arg1)->m_y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13025,8 +14564,9 @@ static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_leftDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_leftDown = arg2; @@ -13047,10 +14587,13 @@ static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_leftDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_leftDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13068,8 +14611,9 @@ static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_middleDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_middleDown = arg2; @@ -13090,10 +14634,13 @@ static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_middleDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_middleDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13111,8 +14658,9 @@ static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_rightDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_rightDown = arg2; @@ -13133,10 +14681,13 @@ static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_rightDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_rightDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13154,8 +14705,9 @@ static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_controlDown = arg2; @@ -13176,10 +14728,13 @@ static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_controlDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13197,8 +14752,9 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_shiftDown = arg2; @@ -13219,10 +14775,13 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_shiftDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13240,8 +14799,9 @@ static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_altDown = arg2; @@ -13262,10 +14822,13 @@ static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_altDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13283,8 +14846,9 @@ static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_metaDown = arg2; @@ -13305,10 +14869,13 @@ static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_metaDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13320,12 +14887,16 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *self, PyObject * wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_wheelRotation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_wheelRotation = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13345,10 +14916,11 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_get(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_wheelRotation_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->m_wheelRotation); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13360,12 +14932,16 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *self, PyObject *arg wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_wheelDelta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_wheelDelta = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13385,10 +14961,11 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_get(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_wheelDelta_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->m_wheelDelta); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13400,12 +14977,16 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *self, PyObject wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_linesPerAction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_linesPerAction = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13425,10 +15006,11 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_get(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_linesPerAction_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->m_linesPerAction); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13444,14 +15026,24 @@ static PyObject * MouseEvent_swigregister(PyObject *self, PyObject *args) { } static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxCoord arg1 = (wxCoord) 0 ; - wxCoord arg2 = (wxCoord) 0 ; + int arg1 = (int) 0 ; + int arg2 = (int) 0 ; wxSetCursorEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SetCursorEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SetCursorEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSetCursorEvent *)new wxSetCursorEvent(arg1,arg2); @@ -13459,7 +15051,7 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSetCursorEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSetCursorEvent, 1); return resultobj; fail: return NULL; @@ -13469,22 +15061,23 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_GetX",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSetCursorEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxSetCursorEvent const *)arg1)->GetX(); + result = (int)((wxSetCursorEvent const *)arg1)->GetX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13494,22 +15087,23 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_GetY",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSetCursorEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxSetCursorEvent const *)arg1)->GetY(); + result = (int)((wxSetCursorEvent const *)arg1)->GetY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13527,10 +15121,14 @@ static PyObject *_wrap_SetCursorEvent_SetCursor(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SetCursorEvent_SetCursor",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSetCursorEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxCursor, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13556,7 +15154,8 @@ static PyObject *_wrap_SetCursorEvent_GetCursor(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_GetCursor",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSetCursorEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -13567,7 +15166,10 @@ static PyObject *_wrap_SetCursorEvent_GetCursor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 0); + { + wxCursor* resultptr = new wxCursor(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxCursor, 1); + } return resultobj; fail: return NULL; @@ -13584,7 +15186,8 @@ static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SetCursorEvent_HasCursor",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSetCursorEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxSetCursorEvent const *)arg1)->HasCursor(); @@ -13592,7 +15195,9 @@ static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13610,11 +15215,16 @@ static PyObject *_wrap_new_KeyEvent(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxKeyEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "keyType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_KeyEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_KeyEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxKeyEvent *)new wxKeyEvent(arg1); @@ -13622,7 +15232,7 @@ static PyObject *_wrap_new_KeyEvent(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxKeyEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxKeyEvent, 1); return resultobj; fail: return NULL; @@ -13639,7 +15249,8 @@ static PyObject *_wrap_KeyEvent_ControlDown(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_ControlDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxKeyEvent const *)arg1)->ControlDown(); @@ -13647,7 +15258,9 @@ static PyObject *_wrap_KeyEvent_ControlDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13664,7 +15277,8 @@ static PyObject *_wrap_KeyEvent_MetaDown(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_MetaDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxKeyEvent const *)arg1)->MetaDown(); @@ -13672,7 +15286,9 @@ static PyObject *_wrap_KeyEvent_MetaDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13689,7 +15305,8 @@ static PyObject *_wrap_KeyEvent_AltDown(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_AltDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxKeyEvent const *)arg1)->AltDown(); @@ -13697,7 +15314,9 @@ static PyObject *_wrap_KeyEvent_AltDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13714,7 +15333,8 @@ static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_ShiftDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxKeyEvent const *)arg1)->ShiftDown(); @@ -13722,7 +15342,9 @@ static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13739,7 +15361,8 @@ static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_HasModifiers",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxKeyEvent const *)arg1)->HasModifiers(); @@ -13747,7 +15370,9 @@ static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13764,7 +15389,8 @@ static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetKeyCode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxKeyEvent const *)arg1)->GetKeyCode(); @@ -13772,7 +15398,7 @@ static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13789,7 +15415,8 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetUniChar",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxKeyEvent_GetUniChar(arg1); @@ -13797,7 +15424,7 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13807,22 +15434,23 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetRawKeyCode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxUint32)((wxKeyEvent const *)arg1)->GetRawKeyCode(); + result = (unsigned int)((wxKeyEvent const *)arg1)->GetRawKeyCode(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -13832,22 +15460,23 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetRawKeyFlags",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxUint32)((wxKeyEvent const *)arg1)->GetRawKeyFlags(); + result = (unsigned int)((wxKeyEvent const *)arg1)->GetRawKeyFlags(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -13864,7 +15493,8 @@ static PyObject *_wrap_KeyEvent_GetPosition(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPosition(); @@ -13875,7 +15505,7 @@ static PyObject *_wrap_KeyEvent_GetPosition(PyObject *self, PyObject *args, PyOb { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -13898,7 +15528,8 @@ static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *self, PyObject *args, arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetPositionTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetPosition(arg2,arg3); @@ -13924,22 +15555,23 @@ static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *self, PyObject *args, static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetX",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxKeyEvent const *)arg1)->GetX(); + result = (int)((wxKeyEvent const *)arg1)->GetX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13949,22 +15581,23 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetY",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxKeyEvent const *)arg1)->GetY(); + result = (int)((wxKeyEvent const *)arg1)->GetY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -13974,14 +15607,18 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:KeyEvent_m_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13994,17 +15631,18 @@ static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_x); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (int) ((arg1)->m_x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -14014,14 +15652,18 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:KeyEvent_m_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14034,17 +15676,18 @@ static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_y); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (int) ((arg1)->m_y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -14056,12 +15699,16 @@ static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *self, PyObject *args, Py wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_keyCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:KeyEvent_m_keyCode_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_keyCode_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_keyCode = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14081,10 +15728,11 @@ static PyObject *_wrap_KeyEvent_m_keyCode_get(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_keyCode_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (long) ((arg1)->m_keyCode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -14102,8 +15750,9 @@ static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_controlDown = arg2; @@ -14124,10 +15773,13 @@ static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_controlDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14145,8 +15797,9 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_shiftDown = arg2; @@ -14167,10 +15820,13 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_shiftDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14188,8 +15844,9 @@ static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_altDown = arg2; @@ -14210,10 +15867,13 @@ static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_altDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14231,8 +15891,9 @@ static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_metaDown = arg2; @@ -14253,10 +15914,13 @@ static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_metaDown_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14274,8 +15938,9 @@ static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_scanCode_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_scanCode = arg2; @@ -14296,10 +15961,13 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_scanCode_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (bool) ((arg1)->m_scanCode); - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14309,7 +15977,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 arg2 ; + unsigned int arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14317,8 +15985,9 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxUint32) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_rawCode = arg2; @@ -14332,17 +16001,18 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawCode_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxUint32) ((arg1)->m_rawCode); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (unsigned int) ((arg1)->m_rawCode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14352,7 +16022,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 arg2 ; + unsigned int arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14360,8 +16030,9 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxUint32) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_rawFlags = arg2; @@ -14375,17 +16046,18 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawFlags_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxUint32) ((arg1)->m_rawFlags); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (unsigned int) ((arg1)->m_rawFlags); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14407,17 +16079,22 @@ static PyObject *_wrap_new_SizeEvent(PyObject *self, PyObject *args, PyObject *k wxSizeEvent *result; wxSize temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "sz",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_SizeEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SizeEvent",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = &temp1; if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; } } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizeEvent *)new wxSizeEvent((wxSize const &)*arg1,arg2); @@ -14425,7 +16102,7 @@ static PyObject *_wrap_new_SizeEvent(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSizeEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizeEvent, 1); return resultobj; fail: return NULL; @@ -14442,7 +16119,8 @@ static PyObject *_wrap_SizeEvent_GetSize(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxSizeEvent const *)arg1)->GetSize(); @@ -14453,7 +16131,7 @@ static PyObject *_wrap_SizeEvent_GetSize(PyObject *self, PyObject *args, PyObjec { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -14471,7 +16149,8 @@ static PyObject *_wrap_SizeEvent_GetRect(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_GetRect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxSizeEvent const *)arg1)->GetRect(); @@ -14482,7 +16161,7 @@ static PyObject *_wrap_SizeEvent_GetRect(PyObject *self, PyObject *args, PyObjec { wxRect * resultptr; resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1); } return resultobj; fail: @@ -14502,9 +16181,11 @@ static PyObject *_wrap_SizeEvent_SetRect(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_SetRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&argp2),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg2 = *argp2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRect(arg2); @@ -14531,9 +16212,11 @@ static PyObject *_wrap_SizeEvent_SetSize(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_SetSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&argp2),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg2 = *argp2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizeEvent_SetSize(arg1,arg2); @@ -14559,8 +16242,10 @@ static PyObject *_wrap_SizeEvent_m_size_set(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_m_size_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (arg1) (arg1)->m_size = *arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14580,10 +16265,11 @@ static PyObject *_wrap_SizeEvent_m_size_get(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_m_size_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxSize *)& ((arg1)->m_size); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSize, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSize, 0); return resultobj; fail: return NULL; @@ -14601,8 +16287,10 @@ static PyObject *_wrap_SizeEvent_m_rect_set(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizeEvent_m_rect_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (arg1) (arg1)->m_rect = *arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14622,10 +16310,11 @@ static PyObject *_wrap_SizeEvent_m_rect_get(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizeEvent_m_rect_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxRect *)& ((arg1)->m_rect); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0); return resultobj; fail: return NULL; @@ -14647,17 +16336,22 @@ static PyObject *_wrap_new_MoveEvent(PyObject *self, PyObject *args, PyObject *k wxMoveEvent *result; wxPoint temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "pos",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_MoveEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MoveEvent",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = &temp1; if ( ! wxPoint_helper(obj0, &arg1)) SWIG_fail; } } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMoveEvent *)new wxMoveEvent((wxPoint const &)*arg1,arg2); @@ -14665,7 +16359,7 @@ static PyObject *_wrap_new_MoveEvent(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMoveEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMoveEvent, 1); return resultobj; fail: return NULL; @@ -14682,7 +16376,8 @@ static PyObject *_wrap_MoveEvent_GetPosition(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMoveEvent const *)arg1)->GetPosition(); @@ -14693,7 +16388,7 @@ static PyObject *_wrap_MoveEvent_GetPosition(PyObject *self, PyObject *args, PyO { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -14711,7 +16406,8 @@ static PyObject *_wrap_MoveEvent_GetRect(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_GetRect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMoveEvent const *)arg1)->GetRect(); @@ -14722,7 +16418,7 @@ static PyObject *_wrap_MoveEvent_GetRect(PyObject *self, PyObject *args, PyObjec { wxRect * resultptr; resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1); } return resultobj; fail: @@ -14742,9 +16438,11 @@ static PyObject *_wrap_MoveEvent_SetRect(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_SetRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&argp2),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg2 = *argp2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRect(arg2); @@ -14771,9 +16469,11 @@ static PyObject *_wrap_MoveEvent_SetPosition(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&argp2),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg2 = *argp2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMoveEvent_SetPosition(arg1,arg2); @@ -14799,8 +16499,10 @@ static PyObject *_wrap_MoveEvent_m_pos_set(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_m_pos_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (arg1) (arg1)->m_pos = *arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14820,10 +16522,11 @@ static PyObject *_wrap_MoveEvent_m_pos_get(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_m_pos_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxPoint *)& ((arg1)->m_pos); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0); return resultobj; fail: return NULL; @@ -14841,8 +16544,10 @@ static PyObject *_wrap_MoveEvent_m_rect_set(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_m_rect_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (arg1) (arg1)->m_rect = *arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14862,10 +16567,11 @@ static PyObject *_wrap_MoveEvent_m_rect_get(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_m_rect_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMoveEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMoveEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxRect *)& ((arg1)->m_rect); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRect, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0); return resultobj; fail: return NULL; @@ -14883,11 +16589,16 @@ static PyObject *_wrap_new_PaintEvent(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 = (int) 0 ; wxPaintEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_PaintEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaintEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPaintEvent *)new wxPaintEvent(arg1); @@ -14895,7 +16606,7 @@ static PyObject *_wrap_new_PaintEvent(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPaintEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPaintEvent, 1); return resultobj; fail: return NULL; @@ -14913,11 +16624,16 @@ static PyObject *_wrap_new_NcPaintEvent(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 = (int) 0 ; wxNcPaintEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_NcPaintEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_NcPaintEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNcPaintEvent *)new wxNcPaintEvent(arg1); @@ -14925,7 +16641,7 @@ static PyObject *_wrap_new_NcPaintEvent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxNcPaintEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNcPaintEvent, 1); return resultobj; fail: return NULL; @@ -14944,14 +16660,20 @@ static PyObject *_wrap_new_EraseEvent(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; wxDC *arg2 = (wxDC *) (wxDC *) NULL ; wxEraseEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "Id",(char *) "dc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_EraseEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_EraseEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14960,7 +16682,7 @@ static PyObject *_wrap_new_EraseEvent(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEraseEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEraseEvent, 1); return resultobj; fail: return NULL; @@ -14977,7 +16699,8 @@ static PyObject *_wrap_EraseEvent_GetDC(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EraseEvent_GetDC",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEraseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEraseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDC *)((wxEraseEvent const *)arg1)->GetDC(); @@ -15006,11 +16729,21 @@ static PyObject *_wrap_new_FocusEvent(PyObject *self, PyObject *args, PyObject * wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxFocusEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_FocusEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FocusEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFocusEvent *)new wxFocusEvent(arg1,arg2); @@ -15018,7 +16751,7 @@ static PyObject *_wrap_new_FocusEvent(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFocusEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFocusEvent, 1); return resultobj; fail: return NULL; @@ -15035,7 +16768,8 @@ static PyObject *_wrap_FocusEvent_GetWindow(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FocusEvent_GetWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFocusEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFocusEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxFocusEvent const *)arg1)->GetWindow(); @@ -15063,8 +16797,10 @@ static PyObject *_wrap_FocusEvent_SetWindow(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FocusEvent_SetWindow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFocusEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFocusEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindow(arg2); @@ -15097,7 +16833,8 @@ static PyObject *_wrap_new_ChildFocusEvent(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_ChildFocusEvent",kwnames,&obj0)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15106,7 +16843,7 @@ static PyObject *_wrap_new_ChildFocusEvent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxChildFocusEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChildFocusEvent, 1); return resultobj; fail: return NULL; @@ -15123,7 +16860,8 @@ static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ChildFocusEvent_GetWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChildFocusEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxChildFocusEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxChildFocusEvent const *)arg1)->GetWindow(); @@ -15150,17 +16888,27 @@ static PyObject * ChildFocusEvent_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; int arg3 = (int) 0 ; wxActivateEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "active",(char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iOi:new_ActivateEvent",kwnames,&arg1,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ActivateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -15170,7 +16918,7 @@ static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxActivateEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxActivateEvent, 1); return resultobj; fail: return NULL; @@ -15187,7 +16935,8 @@ static PyObject *_wrap_ActivateEvent_GetActive(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ActivateEvent_GetActive",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxActivateEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxActivateEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxActivateEvent const *)arg1)->GetActive(); @@ -15195,7 +16944,9 @@ static PyObject *_wrap_ActivateEvent_GetActive(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15213,11 +16964,16 @@ static PyObject *_wrap_new_InitDialogEvent(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) 0 ; wxInitDialogEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_InitDialogEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_InitDialogEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxInitDialogEvent *)new wxInitDialogEvent(arg1); @@ -15225,7 +16981,7 @@ static PyObject *_wrap_new_InitDialogEvent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxInitDialogEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxInitDialogEvent, 1); return resultobj; fail: return NULL; @@ -15245,14 +17001,25 @@ static PyObject *_wrap_new_MenuEvent(PyObject *self, PyObject *args, PyObject *k int arg2 = (int) 0 ; wxMenu *arg3 = (wxMenu *) NULL ; wxMenuEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "menu", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_MenuEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_MenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15261,7 +17028,7 @@ static PyObject *_wrap_new_MenuEvent(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMenuEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuEvent, 1); return resultobj; fail: return NULL; @@ -15278,7 +17045,8 @@ static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuEvent_GetMenuId",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxMenuEvent const *)arg1)->GetMenuId(); @@ -15286,7 +17054,7 @@ static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -15303,7 +17071,8 @@ static PyObject *_wrap_MenuEvent_IsPopup(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuEvent_IsPopup",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuEvent const *)arg1)->IsPopup(); @@ -15311,7 +17080,9 @@ static PyObject *_wrap_MenuEvent_IsPopup(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15328,7 +17099,8 @@ static PyObject *_wrap_MenuEvent_GetMenu(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuEvent_GetMenu",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenu *)((wxMenuEvent const *)arg1)->GetMenu(); @@ -15357,11 +17129,21 @@ static PyObject *_wrap_new_CloseEvent(PyObject *self, PyObject *args, PyObject * wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxCloseEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_CloseEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CloseEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCloseEvent *)new wxCloseEvent(arg1,arg2); @@ -15369,7 +17151,7 @@ static PyObject *_wrap_new_CloseEvent(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCloseEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCloseEvent, 1); return resultobj; fail: return NULL; @@ -15387,8 +17169,9 @@ static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetLoggingOff",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15414,7 +17197,8 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetLoggingOff",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxCloseEvent const *)arg1)->GetLoggingOff(); @@ -15422,7 +17206,9 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15432,7 +17218,7 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15440,9 +17226,10 @@ static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:CloseEvent_Veto",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15470,8 +17257,9 @@ static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15497,7 +17285,8 @@ static PyObject *_wrap_CloseEvent_CanVeto(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_CanVeto",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxCloseEvent const *)arg1)->CanVeto(); @@ -15505,7 +17294,9 @@ static PyObject *_wrap_CloseEvent_CanVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15522,7 +17313,8 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetVeto",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxCloseEvent const *)arg1)->GetVeto(); @@ -15530,7 +17322,9 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15547,16 +17341,21 @@ static PyObject * CloseEvent_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; wxShowEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "show", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_ShowEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ShowEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15566,7 +17365,7 @@ static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxShowEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxShowEvent, 1); return resultobj; fail: return NULL; @@ -15584,8 +17383,9 @@ static PyObject *_wrap_ShowEvent_SetShow(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShowEvent_SetShow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShowEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShowEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15611,7 +17411,8 @@ static PyObject *_wrap_ShowEvent_GetShow(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShowEvent_GetShow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShowEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShowEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxShowEvent const *)arg1)->GetShow(); @@ -15619,7 +17420,9 @@ static PyObject *_wrap_ShowEvent_GetShow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15636,16 +17439,21 @@ static PyObject * ShowEvent_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; wxIconizeEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "iconized", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_IconizeEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconizeEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15655,7 +17463,7 @@ static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIconizeEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIconizeEvent, 1); return resultobj; fail: return NULL; @@ -15672,7 +17480,8 @@ static PyObject *_wrap_IconizeEvent_Iconized(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IconizeEvent_Iconized",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconizeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIconizeEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Iconized(); @@ -15680,7 +17489,9 @@ static PyObject *_wrap_IconizeEvent_Iconized(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15698,11 +17509,16 @@ static PyObject *_wrap_new_MaximizeEvent(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; int arg1 = (int) 0 ; wxMaximizeEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_MaximizeEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MaximizeEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMaximizeEvent *)new wxMaximizeEvent(arg1); @@ -15710,7 +17526,7 @@ static PyObject *_wrap_new_MaximizeEvent(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMaximizeEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMaximizeEvent, 1); return resultobj; fail: return NULL; @@ -15734,7 +17550,8 @@ static PyObject *_wrap_DropFilesEvent_GetPosition(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropFilesEvent_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDropFilesEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDropFilesEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPosition(); @@ -15745,7 +17562,7 @@ static PyObject *_wrap_DropFilesEvent_GetPosition(PyObject *self, PyObject *args { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -15763,7 +17580,8 @@ static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropFilesEvent_GetNumberOfFiles",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDropFilesEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDropFilesEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetNumberOfFiles(); @@ -15771,7 +17589,7 @@ static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -15788,7 +17606,8 @@ static PyObject *_wrap_DropFilesEvent_GetFiles(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropFilesEvent_GetFiles",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDropFilesEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDropFilesEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxDropFilesEvent_GetFiles(arg1); @@ -15812,13 +17631,18 @@ static PyObject * DropFilesEvent_swigregister(PyObject *self, PyObject *args) { } static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxUpdateUIEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "commandId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_UpdateUIEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_UpdateUIEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxUpdateUIEvent *)new wxUpdateUIEvent(arg1); @@ -15826,7 +17650,7 @@ static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxUpdateUIEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxUpdateUIEvent, 1); return resultobj; fail: return NULL; @@ -15843,7 +17667,8 @@ static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetChecked",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxUpdateUIEvent const *)arg1)->GetChecked(); @@ -15851,7 +17676,9 @@ static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15868,7 +17695,8 @@ static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetEnabled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxUpdateUIEvent const *)arg1)->GetEnabled(); @@ -15876,7 +17704,9 @@ static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15893,7 +17723,8 @@ static PyObject *_wrap_UpdateUIEvent_GetText(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetText",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxUpdateUIEvent const *)arg1)->GetText(); @@ -15924,7 +17755,8 @@ static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetSetText",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxUpdateUIEvent const *)arg1)->GetSetText(); @@ -15932,7 +17764,9 @@ static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15949,7 +17783,8 @@ static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetSetChecked",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxUpdateUIEvent const *)arg1)->GetSetChecked(); @@ -15957,7 +17792,9 @@ static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15974,7 +17811,8 @@ static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_GetSetEnabled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxUpdateUIEvent const *)arg1)->GetSetEnabled(); @@ -15982,7 +17820,9 @@ static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16000,8 +17840,9 @@ static PyObject *_wrap_UpdateUIEvent_Check(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Check",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16028,8 +17869,9 @@ static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Enable",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16049,7 +17891,7 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -16057,11 +17899,12 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_SetText",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16088,11 +17931,14 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "updateInterval", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:UpdateUIEvent_SetUpdateInterval",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetUpdateInterval",kwnames,&obj0)) goto fail; + arg1 = (long) SWIG_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxUpdateUIEvent::SetUpdateInterval(arg1); @@ -16122,7 +17968,7 @@ static PyObject *_wrap_UpdateUIEvent_GetUpdateInterval(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -16139,7 +17985,8 @@ static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_CanUpdate",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxUpdateUIEvent::CanUpdate(arg1); @@ -16147,7 +17994,9 @@ static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16178,11 +18027,14 @@ static PyObject *_wrap_UpdateUIEvent_ResetUpdateTime(PyObject *self, PyObject *a static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:UpdateUIEvent_SetMode",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetMode",kwnames,&obj0)) goto fail; + arg1 = (wxUpdateUIMode) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxUpdateUIEvent::SetMode((wxUpdateUIMode )arg1); @@ -16212,7 +18064,7 @@ static PyObject *_wrap_UpdateUIEvent_GetMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -16241,7 +18093,7 @@ static PyObject *_wrap_new_SysColourChangedEvent(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSysColourChangedEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSysColourChangedEvent, 1); return resultobj; fail: return NULL; @@ -16257,17 +18109,23 @@ static PyObject * SysColourChangedEvent_swigregister(PyObject *self, PyObject *a } static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxMouseCaptureChangedEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "gainedCapture", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_MouseCaptureChangedEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MouseCaptureChangedEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16276,7 +18134,7 @@ static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMouseCaptureChangedEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMouseCaptureChangedEvent, 1); return resultobj; fail: return NULL; @@ -16293,7 +18151,8 @@ static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *self }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseCaptureChangedEvent_GetCapturedWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseCaptureChangedEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseCaptureChangedEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxMouseCaptureChangedEvent const *)arg1)->GetCapturedWindow(); @@ -16332,7 +18191,7 @@ static PyObject *_wrap_new_DisplayChangedEvent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxDisplayChangedEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDisplayChangedEvent, 1); return resultobj; fail: return NULL; @@ -16348,13 +18207,18 @@ static PyObject * DisplayChangedEvent_swigregister(PyObject *self, PyObject *arg } static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxPaletteChangedEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_PaletteChangedEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaletteChangedEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPaletteChangedEvent *)new wxPaletteChangedEvent(arg1); @@ -16362,7 +18226,7 @@ static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPaletteChangedEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPaletteChangedEvent, 1); return resultobj; fail: return NULL; @@ -16380,8 +18244,10 @@ static PyObject *_wrap_PaletteChangedEvent_SetChangedWindow(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PaletteChangedEvent_SetChangedWindow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPaletteChangedEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPaletteChangedEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetChangedWindow(arg2); @@ -16406,7 +18272,8 @@ static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PaletteChangedEvent_GetChangedWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPaletteChangedEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPaletteChangedEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->GetChangedWindow(); @@ -16432,13 +18299,18 @@ static PyObject * PaletteChangedEvent_swigregister(PyObject *self, PyObject *arg } static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxQueryNewPaletteEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_QueryNewPaletteEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryNewPaletteEvent",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxQueryNewPaletteEvent *)new wxQueryNewPaletteEvent(arg1); @@ -16446,7 +18318,7 @@ static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxQueryNewPaletteEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxQueryNewPaletteEvent, 1); return resultobj; fail: return NULL; @@ -16464,8 +18336,9 @@ static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryNewPaletteEvent_SetPaletteRealized",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryNewPaletteEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxQueryNewPaletteEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16491,7 +18364,8 @@ static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:QueryNewPaletteEvent_GetPaletteRealized",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryNewPaletteEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxQueryNewPaletteEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxQueryNewPaletteEvent const *)arg1)->GetPaletteRealized(); @@ -16499,7 +18373,9 @@ static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16528,7 +18404,7 @@ static PyObject *_wrap_new_NavigationKeyEvent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxNavigationKeyEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNavigationKeyEvent, 1); return resultobj; fail: return NULL; @@ -16545,7 +18421,8 @@ static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NavigationKeyEvent_GetDirection",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxNavigationKeyEvent const *)arg1)->GetDirection(); @@ -16553,7 +18430,9 @@ static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16571,8 +18450,9 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16598,7 +18478,8 @@ static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NavigationKeyEvent_IsWindowChange",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxNavigationKeyEvent const *)arg1)->IsWindowChange(); @@ -16606,7 +18487,9 @@ static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16624,8 +18507,9 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16651,7 +18535,8 @@ static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NavigationKeyEvent_GetCurrentFocus",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxNavigationKeyEvent const *)arg1)->GetCurrentFocus(); @@ -16679,8 +18564,10 @@ static PyObject *_wrap_NavigationKeyEvent_SetCurrentFocus(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetCurrentFocus",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCurrentFocus(arg2); @@ -16713,7 +18600,8 @@ static PyObject *_wrap_new_WindowCreateEvent(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_WindowCreateEvent",kwnames,&obj0)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16722,7 +18610,7 @@ static PyObject *_wrap_new_WindowCreateEvent(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxWindowCreateEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindowCreateEvent, 1); return resultobj; fail: return NULL; @@ -16739,7 +18627,8 @@ static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WindowCreateEvent_GetWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindowCreateEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindowCreateEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxWindowCreateEvent const *)arg1)->GetWindow(); @@ -16774,7 +18663,8 @@ static PyObject *_wrap_new_WindowDestroyEvent(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_WindowDestroyEvent",kwnames,&obj0)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16783,7 +18673,7 @@ static PyObject *_wrap_new_WindowDestroyEvent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxWindowDestroyEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindowDestroyEvent, 1); return resultobj; fail: return NULL; @@ -16800,7 +18690,8 @@ static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WindowDestroyEvent_GetWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindowDestroyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindowDestroyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxWindowDestroyEvent const *)arg1)->GetWindow(); @@ -16827,17 +18718,27 @@ static PyObject * WindowDestroyEvent_swigregister(PyObject *self, PyObject *args static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; - wxWindowID arg2 = (wxWindowID) 0 ; + int arg2 = (int) 0 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxContextMenuEvent *result; wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_ContextMenuEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ContextMenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -16851,7 +18752,7 @@ static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxContextMenuEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxContextMenuEvent, 1); return resultobj; fail: return NULL; @@ -16868,7 +18769,8 @@ static PyObject *_wrap_ContextMenuEvent_GetPosition(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ContextMenuEvent_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxContextMenuEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxContextMenuEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16879,7 +18781,7 @@ static PyObject *_wrap_ContextMenuEvent_GetPosition(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPoint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0); return resultobj; fail: return NULL; @@ -16898,7 +18800,8 @@ static PyObject *_wrap_ContextMenuEvent_SetPosition(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ContextMenuEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxContextMenuEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxContextMenuEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -16939,7 +18842,7 @@ static PyObject *_wrap_new_IdleEvent(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIdleEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIdleEvent, 1); return resultobj; fail: return NULL; @@ -16949,7 +18852,7 @@ static PyObject *_wrap_new_IdleEvent(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxIdleEvent *arg1 = (wxIdleEvent *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -16957,9 +18860,10 @@ static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:IdleEvent_RequestMore",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIdleEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIdleEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16986,7 +18890,8 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_MoreRequested",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIdleEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIdleEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxIdleEvent const *)arg1)->MoreRequested(); @@ -16994,7 +18899,9 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17004,11 +18911,14 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P static PyObject *_wrap_IdleEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:IdleEvent_SetMode",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_SetMode",kwnames,&obj0)) goto fail; + arg1 = (wxIdleMode) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxIdleEvent::SetMode((wxIdleMode )arg1); @@ -17038,7 +18948,7 @@ static PyObject *_wrap_IdleEvent_GetMode(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -17055,7 +18965,8 @@ static PyObject *_wrap_IdleEvent_CanSend(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_CanSend",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxIdleEvent::CanSend(arg1); @@ -17063,7 +18974,9 @@ static PyObject *_wrap_IdleEvent_CanSend(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17082,11 +18995,21 @@ static PyObject *_wrap_new_PyEvent(PyObject *self, PyObject *args, PyObject *kwa int arg1 = (int) 0 ; wxEventType arg2 = (wxEventType) wxEVT_NULL ; wxPyEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "commandType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_PyEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (wxEventType) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyEvent *)new wxPyEvent(arg1,arg2); @@ -17094,7 +19017,7 @@ static PyObject *_wrap_new_PyEvent(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyEvent, 1); return resultobj; fail: return NULL; @@ -17110,7 +19033,8 @@ static PyObject *_wrap_delete_PyEvent(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyEvent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -17136,7 +19060,8 @@ static PyObject *_wrap_PyEvent_SetSelf(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17162,7 +19087,8 @@ static PyObject *_wrap_PyEvent_GetSelf(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyEvent_GetSelf",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->GetSelf(); @@ -17189,11 +19115,21 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *self, PyObject *args, PyObje wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxPyCommandEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_PyCommandEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyCommandEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (wxEventType) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyCommandEvent *)new wxPyCommandEvent(arg1,arg2); @@ -17201,7 +19137,7 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyCommandEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyCommandEvent, 1); return resultobj; fail: return NULL; @@ -17217,7 +19153,8 @@ static PyObject *_wrap_delete_PyCommandEvent(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyCommandEvent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -17243,7 +19180,8 @@ static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCommandEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17269,7 +19207,8 @@ static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCommandEvent_GetSelf",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->GetSelf(); @@ -17324,7 +19263,8 @@ static PyObject *_wrap_delete_PyApp(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PyApp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -17352,7 +19292,8 @@ static PyObject *_wrap_PyApp__setCallbackInfo(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -17379,7 +19320,8 @@ static PyObject *_wrap_PyApp_GetAppName(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetAppName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyApp const *)arg1)->GetAppName(); @@ -17404,7 +19346,7 @@ static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17412,11 +19354,12 @@ static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetAppName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17450,7 +19393,8 @@ static PyObject *_wrap_PyApp_GetClassName(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetClassName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyApp const *)arg1)->GetClassName(); @@ -17475,7 +19419,7 @@ static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17483,11 +19427,12 @@ static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetClassName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17521,7 +19466,8 @@ static PyObject *_wrap_PyApp_GetVendorName(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetVendorName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -17532,7 +19478,13 @@ static PyObject *_wrap_PyApp_GetVendorName(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -17543,7 +19495,7 @@ static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17551,11 +19503,12 @@ static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetVendorName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17589,7 +19542,8 @@ static PyObject *_wrap_PyApp_GetTraits(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetTraits",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxAppTraits *)(arg1)->GetTraits(); @@ -17597,7 +19551,7 @@ static PyObject *_wrap_PyApp_GetTraits(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAppTraits, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAppTraits, 0); return resultobj; fail: return NULL; @@ -17613,7 +19567,8 @@ static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_ProcessPendingEvents",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ProcessPendingEvents(); @@ -17631,7 +19586,7 @@ static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *self, PyObject *args static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; - bool arg2 = (bool) false ; + bool arg2 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -17640,9 +19595,10 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyApp_Yield",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17652,7 +19608,9 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17668,7 +19626,8 @@ static PyObject *_wrap_PyApp_WakeUpIdle(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_WakeUpIdle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->WakeUpIdle(); @@ -17693,7 +19652,8 @@ static PyObject *_wrap_PyApp_MainLoop(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_MainLoop",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->MainLoop(); @@ -17701,7 +19661,7 @@ static PyObject *_wrap_PyApp_MainLoop(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -17717,7 +19677,8 @@ static PyObject *_wrap_PyApp_Exit(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_Exit",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Exit(); @@ -17741,7 +19702,8 @@ static PyObject *_wrap_PyApp_ExitMainLoop(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_ExitMainLoop",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ExitMainLoop(); @@ -17766,7 +19728,8 @@ static PyObject *_wrap_PyApp_Pending(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_Pending",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Pending(); @@ -17774,7 +19737,9 @@ static PyObject *_wrap_PyApp_Pending(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17791,7 +19756,8 @@ static PyObject *_wrap_PyApp_Dispatch(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_Dispatch",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Dispatch(); @@ -17799,7 +19765,9 @@ static PyObject *_wrap_PyApp_Dispatch(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17816,7 +19784,8 @@ static PyObject *_wrap_PyApp_ProcessIdle(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_ProcessIdle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ProcessIdle(); @@ -17824,7 +19793,9 @@ static PyObject *_wrap_PyApp_ProcessIdle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17845,11 +19816,16 @@ static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyApp_SendIdleEvents",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxIdleEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxIdleEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17858,37 +19834,9 @@ static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PyApp_OnIdle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyApp *arg1 = (wxPyApp *) 0 ; - wxIdleEvent *arg2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "event", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_OnIdle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIdleEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->OnIdle(*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } - Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -17905,7 +19853,8 @@ static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_IsActive",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyApp const *)arg1)->IsActive(); @@ -17913,7 +19862,9 @@ static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17931,8 +19882,10 @@ static PyObject *_wrap_PyApp_SetTopWindow(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetTopWindow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTopWindow(arg2); @@ -17957,7 +19910,8 @@ static PyObject *_wrap_PyApp_GetTopWindow(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetTopWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxPyApp const *)arg1)->GetTopWindow(); @@ -17985,8 +19939,9 @@ static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetExitOnFrameDelete",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18012,7 +19967,8 @@ static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetExitOnFrameDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyApp const *)arg1)->GetExitOnFrameDelete(); @@ -18020,7 +19976,9 @@ static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18038,8 +19996,9 @@ static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetUseBestVisual",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18065,7 +20024,8 @@ static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetUseBestVisual",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyApp const *)arg1)->GetUseBestVisual(); @@ -18073,7 +20033,9 @@ static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18085,12 +20047,16 @@ static PyObject *_wrap_PyApp_SetPrintMode(PyObject *self, PyObject *args, PyObje wxPyApp *arg1 = (wxPyApp *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetPrintMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetPrintMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrintMode(arg2); @@ -18115,7 +20081,8 @@ static PyObject *_wrap_PyApp_GetPrintMode(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetPrintMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyApp const *)arg1)->GetPrintMode(); @@ -18123,57 +20090,62 @@ static PyObject *_wrap_PyApp_GetPrintMode(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; - int result; + int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetAssertMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetAssertMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetAssertMode(); + (arg1)->SetAssertMode(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; - int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "mode", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetAssertMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetAssertMode",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetAssertMode(arg2); + result = (int)(arg1)->GetAssertMode(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -18195,7 +20167,9 @@ static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18217,7 +20191,7 @@ static PyObject *_wrap_PyApp_GetMacAboutMenuItemId(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -18239,7 +20213,7 @@ static PyObject *_wrap_PyApp_GetMacPreferencesMenuItemId(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -18261,7 +20235,7 @@ static PyObject *_wrap_PyApp_GetMacExitMenuItemId(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -18305,7 +20279,7 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacSupportPCMenuShortcuts",kwnames,&obj0)) goto fail; - arg1 = PyInt_AsLong(obj0) ? true : false; + arg1 = (bool) SWIG_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18324,11 +20298,14 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacAboutMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacAboutMenuItemId",kwnames,&obj0)) goto fail; + arg1 = (long) SWIG_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacAboutMenuItemId(arg1); @@ -18346,11 +20323,14 @@ static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *arg static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacPreferencesMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacPreferencesMenuItemId",kwnames,&obj0)) goto fail; + arg1 = (long) SWIG_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacPreferencesMenuItemId(arg1); @@ -18368,11 +20348,14 @@ static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObjec static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacExitMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacExitMenuItemId",kwnames,&obj0)) goto fail; + arg1 = (long) SWIG_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacExitMenuItemId(arg1); @@ -18390,7 +20373,7 @@ static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL @@ -18400,7 +20383,7 @@ static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *a { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18433,7 +20416,8 @@ static PyObject *_wrap_PyApp__BootstrapApp(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp__BootstrapApp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_BootstrapApp(); @@ -18463,7 +20447,7 @@ static PyObject *_wrap_PyApp_GetComCtl32Version(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -18513,7 +20497,9 @@ static PyObject *_wrap_Yield(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18535,7 +20521,9 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18545,7 +20533,7 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) NULL ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -18555,10 +20543,11 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:SafeYield",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18568,7 +20557,9 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18607,10 +20598,14 @@ static PyObject *_wrap_PostEvent(PyObject *self, PyObject *args, PyObject *kwarg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PostEvent",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18671,10 +20666,434 @@ static PyObject *_wrap_GetApp(PyObject *self, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) 0 ; + int arg2 = (int) 0 ; + int arg3 = (int) 0 ; + wxMenuItem *arg4 = (wxMenuItem *) NULL ; + wxAcceleratorEntry *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_AcceleratorEntry",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxAcceleratorEntry *)new wxAcceleratorEntry(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAcceleratorEntry, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_delete_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorEntry",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + wxMenuItem *arg5 = (wxMenuItem *) NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:AcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->Set(arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_SetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + wxMenuItem *arg2 = (wxMenuItem *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AcceleratorEntry_SetMenuItem",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMenuItem(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + wxMenuItem *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetMenuItem",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMenuItem *)((wxAcceleratorEntry const *)arg1)->GetMenuItem(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxObject(result); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetFlags",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetFlags(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_FromInt((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetKeyCode",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetKeyCode(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_FromInt((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetCommand",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCommand(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_FromInt((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject * AcceleratorEntry_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorEntry, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ; + wxAcceleratorTable *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "n", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_AcceleratorTable",kwnames,&obj0)) goto fail; + { + arg2 = wxAcceleratorEntry_LIST_helper(obj0); + if (arg2) arg1 = PyList_Size(obj0); + else arg1 = 0; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxAcceleratorTable *)new wxAcceleratorTable(arg1,(wxAcceleratorEntry const *)arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAcceleratorTable, 1); + { + delete [] arg2; + } + return resultobj; + fail: + { + delete [] arg2; + } + return NULL; +} + + +static PyObject *_wrap_delete_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorTable",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorTable, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorTable_Ok",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorTable, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxAcceleratorTable const *)arg1)->Ok(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorTable, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static int _wrap_NullAcceleratorTable_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only."); + return 1; +} + + +static PyObject *_wrap_NullAcceleratorTable_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *)(&wxNullAcceleratorTable), SWIGTYPE_p_wxAcceleratorTable, 0); + return pyobj; +} + + +static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxString *arg1 = 0 ; + wxAcceleratorEntry *result; + bool temp1 = False ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "label", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetAccelFromString",kwnames,&obj0)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxAcceleratorEntry *)wxGetAccelFromString((wxString const &)*arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAcceleratorEntry, 0); + { + if (temp1) + delete arg1; + } + return resultobj; + fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + +static int _wrap_PanelNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable PanelNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_PanelNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyPanelNameStr)->c_str(), (&wxPyPanelNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyPanelNameStr)->c_str(), (&wxPyPanelNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -18685,17 +21104,22 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar wxWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_Window",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int const) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { { arg3 = &temp3; @@ -18708,11 +21132,15 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + arg5 = (long) SWIG_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -18767,7 +21195,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -18778,19 +21206,25 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Window_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (int const) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { { arg4 = &temp4; @@ -18803,11 +21237,15 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + arg6 = (long) SWIG_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -18817,7 +21255,9 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp7) delete arg7; @@ -18835,7 +21275,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -18844,9 +21284,10 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Close",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18856,7 +21297,9 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18873,7 +21316,8 @@ static PyObject *_wrap_Window_Destroy(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Destroy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Destroy(); @@ -18881,7 +21325,9 @@ static PyObject *_wrap_Window_Destroy(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18898,7 +21344,8 @@ static PyObject *_wrap_Window_DestroyChildren(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_DestroyChildren",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DestroyChildren(); @@ -18906,7 +21353,9 @@ static PyObject *_wrap_Window_DestroyChildren(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18923,7 +21372,8 @@ static PyObject *_wrap_Window_IsBeingDeleted(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsBeingDeleted",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsBeingDeleted(); @@ -18931,7 +21381,9 @@ static PyObject *_wrap_Window_IsBeingDeleted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18942,7 +21394,7 @@ static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18950,11 +21402,12 @@ static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetTitle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18988,7 +21441,8 @@ static PyObject *_wrap_Window_GetTitle(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetTitle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetTitle(); @@ -19013,7 +21467,7 @@ static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -19021,11 +21475,12 @@ static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetLabel",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19059,7 +21514,8 @@ static PyObject *_wrap_Window_GetLabel(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetLabel",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetLabel(); @@ -19084,7 +21540,7 @@ static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -19092,11 +21548,12 @@ static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19130,7 +21587,8 @@ static PyObject *_wrap_Window_GetName(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetName(); @@ -19151,17 +21609,76 @@ static PyObject *_wrap_Window_GetName(PyObject *self, PyObject *args, PyObject * } +static PyObject *_wrap_Window_SetWindowVariant(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowVariant",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (wxWindowVariant) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetWindowVariant((wxWindowVariant )arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_GetWindowVariant(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetWindowVariant",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxWindow const *)arg1)->GetWindowVariant(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_FromInt((int)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_SetId",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetId",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -19179,22 +21696,23 @@ static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetId",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxWindowID)((wxWindow const *)arg1)->GetId(); + result = (int)((wxWindow const *)arg1)->GetId(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -19216,7 +21734,7 @@ static PyObject *_wrap_Window_NewControlId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -19227,11 +21745,14 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Window_NextControlId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_NextControlId",kwnames,&obj0)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxWindow::NextControlId(arg1); @@ -19239,7 +21760,7 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -19250,11 +21771,14 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Window_PrevControlId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PrevControlId",kwnames,&obj0)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxWindow::PrevControlId(arg1); @@ -19262,7 +21786,7 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -19281,7 +21805,8 @@ static PyObject *_wrap_Window_SetSize(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -19309,12 +21834,30 @@ static PyObject *_wrap_Window_SetDimensions(PyObject *self, PyObject *args, PyOb int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:Window_SetDimensions",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetDimensions",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3,arg4,arg5,arg6); @@ -19337,16 +21880,22 @@ static PyObject *_wrap_Window_SetRect(PyObject *self, PyObject *args, PyObject * wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rect",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Window_SetRect",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetRect",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize((wxRect const &)*arg2,arg3); @@ -19367,12 +21916,19 @@ static PyObject *_wrap_Window_SetSizeWH(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_SetSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -19395,16 +21951,22 @@ static PyObject *_wrap_Window_Move(PyObject *self, PyObject *args, PyObject *kwa wxPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Window_Move",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_Move",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move((wxPoint const &)*arg2,arg3); @@ -19426,12 +21988,24 @@ static PyObject *_wrap_Window_MoveXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; int arg4 = (int) wxSIZE_USE_EXISTING ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:Window_MoveXY",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_MoveXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move(arg2,arg3,arg4); @@ -19455,7 +22029,8 @@ static PyObject *_wrap_Window_Raise(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Raise",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Raise(); @@ -19479,7 +22054,8 @@ static PyObject *_wrap_Window_Lower(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Lower",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Lower(); @@ -19506,7 +22082,8 @@ static PyObject *_wrap_Window_SetClientSize(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetClientSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -19531,12 +22108,19 @@ static PyObject *_wrap_Window_SetClientSizeWH(PyObject *self, PyObject *args, Py int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_SetClientSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetClientSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetClientSize(arg2,arg3); @@ -19563,7 +22147,8 @@ static PyObject *_wrap_Window_SetClientRect(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetClientRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -19592,10 +22177,11 @@ static PyObject *_wrap_Window_GetPosition(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetPosition(); + result = (arg1)->GetPosition(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19603,7 +22189,7 @@ static PyObject *_wrap_Window_GetPosition(PyObject *self, PyObject *args, PyObje { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -19626,10 +22212,11 @@ static PyObject *_wrap_Window_GetPositionTuple(PyObject *self, PyObject *args, P arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetPositionTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxWindow const *)arg1)->GetPosition(arg2,arg3); + (arg1)->GetPosition(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19659,7 +22246,8 @@ static PyObject *_wrap_Window_GetSize(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetSize(); @@ -19670,7 +22258,7 @@ static PyObject *_wrap_Window_GetSize(PyObject *self, PyObject *args, PyObject * { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -19693,7 +22281,8 @@ static PyObject *_wrap_Window_GetSizeTuple(PyObject *self, PyObject *args, PyObj arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetSizeTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxWindow const *)arg1)->GetSize(arg2,arg3); @@ -19726,7 +22315,8 @@ static PyObject *_wrap_Window_GetRect(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetRect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetRect(); @@ -19737,7 +22327,7 @@ static PyObject *_wrap_Window_GetRect(PyObject *self, PyObject *args, PyObject * { wxRect * resultptr; resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1); } return resultobj; fail: @@ -19755,7 +22345,8 @@ static PyObject *_wrap_Window_GetClientSize(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetClientSize(); @@ -19766,7 +22357,7 @@ static PyObject *_wrap_Window_GetClientSize(PyObject *self, PyObject *args, PyOb { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -19789,7 +22380,8 @@ static PyObject *_wrap_Window_GetClientSizeTuple(PyObject *self, PyObject *args, arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientSizeTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxWindow const *)arg1)->GetClientSize(arg2,arg3); @@ -19822,7 +22414,8 @@ static PyObject *_wrap_Window_GetClientAreaOrigin(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientAreaOrigin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetClientAreaOrigin(); @@ -19833,7 +22426,7 @@ static PyObject *_wrap_Window_GetClientAreaOrigin(PyObject *self, PyObject *args { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -19851,7 +22444,8 @@ static PyObject *_wrap_Window_GetClientRect(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientRect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetClientRect(); @@ -19862,7 +22456,7 @@ static PyObject *_wrap_Window_GetClientRect(PyObject *self, PyObject *args, PyOb { wxRect * resultptr; resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1); } return resultobj; fail: @@ -19880,7 +22474,8 @@ static PyObject *_wrap_Window_GetBestSize(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetBestSize(); @@ -19891,7 +22486,7 @@ static PyObject *_wrap_Window_GetBestSize(PyObject *self, PyObject *args, PyObje { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -19914,7 +22509,8 @@ static PyObject *_wrap_Window_GetBestSizeTuple(PyObject *self, PyObject *args, P arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestSizeTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxWindow const *)arg1)->GetBestSize(arg2,arg3); @@ -19947,7 +22543,8 @@ static PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetAdjustedBestSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetAdjustedBestSize(); @@ -19958,7 +22555,7 @@ static PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *self, PyObject *args { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -19971,12 +22568,18 @@ static PyObject *_wrap_Window_Center(PyObject *self, PyObject *args, PyObject *k wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_Center",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Center",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Center(arg2); @@ -19996,12 +22599,18 @@ static PyObject *_wrap_Window_CenterOnScreen(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_CenterOnScreen",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnScreen",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CenterOnScreen(arg2); @@ -20021,12 +22630,18 @@ static PyObject *_wrap_Window_CenterOnParent(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_CenterOnParent",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnParent",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CenterOnParent(arg2); @@ -20050,7 +22665,8 @@ static PyObject *_wrap_Window_Fit(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Fit",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Fit(); @@ -20074,7 +22690,8 @@ static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_FitInside",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FitInside(); @@ -20099,12 +22716,39 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj int arg6 = (int) -1 ; int arg7 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH",(char *) "incW",(char *) "incH", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiii:Window_SetSizeHints",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSizeHints(arg2,arg3,arg4,arg5,arg6,arg7); @@ -20127,12 +22771,29 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args int arg4 = (int) -1 ; int arg5 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|ii:Window_SetVirtualSizeHints",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVirtualSizeHints(arg2,arg3,arg4,arg5); @@ -20157,7 +22818,8 @@ static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetMinWidth(); @@ -20165,7 +22827,7 @@ static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20182,7 +22844,8 @@ static PyObject *_wrap_Window_GetMinHeight(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetMinHeight(); @@ -20190,7 +22853,7 @@ static PyObject *_wrap_Window_GetMinHeight(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20207,7 +22870,8 @@ static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetMaxWidth(); @@ -20215,7 +22879,7 @@ static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20232,7 +22896,8 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetMaxHeight(); @@ -20240,7 +22905,7 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20257,7 +22922,8 @@ static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetMaxSize(); @@ -20268,7 +22934,7 @@ static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObjec { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -20288,7 +22954,8 @@ static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetVirtualSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -20313,12 +22980,19 @@ static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *self, PyObject *args, P int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_SetVirtualSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetVirtualSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVirtualSize(arg2,arg3); @@ -20343,7 +23017,8 @@ static PyObject *_wrap_Window_GetVirtualSize(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetVirtualSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetVirtualSize(); @@ -20354,7 +23029,7 @@ static PyObject *_wrap_Window_GetVirtualSize(PyObject *self, PyObject *args, PyO { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -20377,7 +23052,8 @@ static PyObject *_wrap_Window_GetVirtualSizeTuple(PyObject *self, PyObject *args arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetVirtualSizeTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxWindow const *)arg1)->GetVirtualSize(arg2,arg3); @@ -20410,7 +23086,8 @@ static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestVirtualSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetBestVirtualSize(); @@ -20421,7 +23098,7 @@ static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *self, PyObject *args, { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -20432,7 +23109,7 @@ static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *self, PyObject *args, static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20441,9 +23118,10 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Show",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20453,7 +23131,9 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20470,7 +23150,8 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Hide",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Hide(); @@ -20478,7 +23159,9 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20488,7 +23171,7 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20497,9 +23180,10 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Enable",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20509,7 +23193,9 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20526,7 +23212,8 @@ static PyObject *_wrap_Window_Disable(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Disable",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Disable(); @@ -20534,7 +23221,9 @@ static PyObject *_wrap_Window_Disable(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20551,7 +23240,8 @@ static PyObject *_wrap_Window_IsShown(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsShown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsShown(); @@ -20559,7 +23249,9 @@ static PyObject *_wrap_Window_IsShown(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20576,7 +23268,8 @@ static PyObject *_wrap_Window_IsEnabled(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsEnabled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsEnabled(); @@ -20584,7 +23277,9 @@ static PyObject *_wrap_Window_IsEnabled(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20596,12 +23291,16 @@ static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *self, PyObject *args, wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetWindowStyleFlag",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindowStyleFlag(arg2); @@ -20626,7 +23325,8 @@ static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetWindowStyleFlag",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxWindow const *)arg1)->GetWindowStyleFlag(); @@ -20634,57 +23334,7 @@ static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Window_SetWindowStyle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - long arg2 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "style", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetWindowStyle",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetWindowStyle(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Window_GetWindowStyle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - long result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetWindowStyle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (long)((wxWindow const *)arg1)->GetWindowStyle(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -20697,12 +23347,16 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_HasFlag",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasFlag",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->HasFlag(arg2); @@ -20710,7 +23364,9 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20727,7 +23383,8 @@ static PyObject *_wrap_Window_IsRetained(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsRetained",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsRetained(); @@ -20735,7 +23392,9 @@ static PyObject *_wrap_Window_IsRetained(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -20747,12 +23406,16 @@ static PyObject *_wrap_Window_SetExtraStyle(PyObject *self, PyObject *args, PyOb wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "exStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetExtraStyle",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetExtraStyle",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraStyle(arg2); @@ -20777,7 +23440,8 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetExtraStyle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxWindow const *)arg1)->GetExtraStyle(); @@ -20785,7 +23449,7 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -20795,7 +23459,7 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -20803,9 +23467,10 @@ static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_MakeModal",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20833,8 +23498,9 @@ static PyObject *_wrap_Window_SetThemeEnabled(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetThemeEnabled",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20860,7 +23526,8 @@ static PyObject *_wrap_Window_GetThemeEnabled(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetThemeEnabled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->GetThemeEnabled(); @@ -20868,32 +23535,9 @@ static PyObject *_wrap_Window_GetThemeEnabled(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Window_ShouldInheritColours(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_ShouldInheritColours",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxWindow const *)arg1)->ShouldInheritColours(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } - resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; @@ -20909,7 +23553,8 @@ static PyObject *_wrap_Window_SetFocus(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_SetFocus",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFocus(); @@ -20933,7 +23578,8 @@ static PyObject *_wrap_Window_SetFocusFromKbd(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_SetFocusFromKbd",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFocusFromKbd(); @@ -20982,7 +23628,8 @@ static PyObject *_wrap_Window_AcceptsFocus(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_AcceptsFocus",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->AcceptsFocus(); @@ -20990,7 +23637,9 @@ static PyObject *_wrap_Window_AcceptsFocus(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21007,7 +23656,8 @@ static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->AcceptsFocusFromKeyboard(); @@ -21015,7 +23665,9 @@ static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21032,7 +23684,8 @@ static PyObject *_wrap_Window_GetDefaultItem(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetDefaultItem",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxWindow const *)arg1)->GetDefaultItem(); @@ -21061,8 +23714,10 @@ static PyObject *_wrap_Window_SetDefaultItem(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->SetDefaultItem(arg2); @@ -21090,8 +23745,10 @@ static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetTmpDefaultItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTmpDefaultItem(arg2); @@ -21116,7 +23773,8 @@ static PyObject *_wrap_Window_GetChildren(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetChildren",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxWindow_GetChildren(arg1); @@ -21141,7 +23799,8 @@ static PyObject *_wrap_Window_GetParent(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetParent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxWindow const *)arg1)->GetParent(); @@ -21168,7 +23827,8 @@ static PyObject *_wrap_Window_GetGrandParent(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetGrandParent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxWindow const *)arg1)->GetGrandParent(); @@ -21195,7 +23855,8 @@ static PyObject *_wrap_Window_IsTopLevel(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_IsTopLevel",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsTopLevel(); @@ -21203,7 +23864,9 @@ static PyObject *_wrap_Window_IsTopLevel(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21222,8 +23885,10 @@ static PyObject *_wrap_Window_Reparent(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_Reparent",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Reparent(arg2); @@ -21231,7 +23896,9 @@ static PyObject *_wrap_Window_Reparent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21249,8 +23916,10 @@ static PyObject *_wrap_Window_AddChild(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_AddChild",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddChild(arg2); @@ -21276,8 +23945,10 @@ static PyObject *_wrap_Window_RemoveChild(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_RemoveChild",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveChild(arg2); @@ -21298,12 +23969,16 @@ static PyObject *_wrap_Window_FindWindowById(PyObject *self, PyObject *args, PyO long arg2 ; wxWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_FindWindowById",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FindWindowById",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->FindWindow(arg2); @@ -21325,7 +24000,7 @@ static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, P wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; wxWindow *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -21333,11 +24008,12 @@ static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FindWindowByName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21373,7 +24049,8 @@ static PyObject *_wrap_Window_GetEventHandler(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetEventHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxEvtHandler *)((wxWindow const *)arg1)->GetEventHandler(); @@ -21401,8 +24078,10 @@ static PyObject *_wrap_Window_SetEventHandler(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetEventHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEventHandler(arg2); @@ -21428,8 +24107,10 @@ static PyObject *_wrap_Window_PushEventHandler(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_PushEventHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PushEventHandler(arg2); @@ -21447,7 +24128,7 @@ static PyObject *_wrap_Window_PushEventHandler(PyObject *self, PyObject *args, P static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; wxEvtHandler *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -21456,9 +24137,10 @@ static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_PopEventHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21489,8 +24171,10 @@ static PyObject *_wrap_Window_RemoveEventHandler(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_RemoveEventHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->RemoveEventHandler(arg2); @@ -21498,7 +24182,9 @@ static PyObject *_wrap_Window_RemoveEventHandler(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21516,10 +24202,14 @@ static PyObject *_wrap_Window_SetValidator(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetValidator",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21545,7 +24235,8 @@ static PyObject *_wrap_Window_GetValidator(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetValidator",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxValidator *)(arg1)->GetValidator(); @@ -21573,10 +24264,14 @@ static PyObject *_wrap_Window_SetAcceleratorTable(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetAcceleratorTable",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxAcceleratorTable, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21602,7 +24297,8 @@ static PyObject *_wrap_Window_GetAcceleratorTable(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetAcceleratorTable",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxAcceleratorTable *)(arg1)->GetAcceleratorTable(); @@ -21610,7 +24306,7 @@ static PyObject *_wrap_Window_GetAcceleratorTable(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorTable, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAcceleratorTable, 0); return resultobj; fail: return NULL; @@ -21625,12 +24321,22 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO int arg4 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hotkeyId",(char *) "modifiers",(char *) "keycode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:Window_RegisterHotKey",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_RegisterHotKey",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxWindow_RegisterHotKey(arg1,arg2,arg3,arg4); @@ -21638,7 +24344,9 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21651,12 +24359,16 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hotkeyId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_UnregisterHotKey",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_UnregisterHotKey",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxWindow_UnregisterHotKey(arg1,arg2); @@ -21664,7 +24376,9 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21684,7 +24398,8 @@ static PyObject *_wrap_Window_ConvertDialogPointToPixels(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertDialogPointToPixels",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -21699,7 +24414,7 @@ static PyObject *_wrap_Window_ConvertDialogPointToPixels(PyObject *self, PyObjec { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -21720,7 +24435,8 @@ static PyObject *_wrap_Window_ConvertDialogSizeToPixels(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertDialogSizeToPixels",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -21735,7 +24451,7 @@ static PyObject *_wrap_Window_ConvertDialogSizeToPixels(PyObject *self, PyObject { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -21756,7 +24472,8 @@ static PyObject *_wrap_Window_DLG_PNT(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DLG_PNT",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -21771,7 +24488,7 @@ static PyObject *_wrap_Window_DLG_PNT(PyObject *self, PyObject *args, PyObject * { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -21792,7 +24509,8 @@ static PyObject *_wrap_Window_DLG_SZE(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DLG_SZE",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -21807,7 +24525,7 @@ static PyObject *_wrap_Window_DLG_SZE(PyObject *self, PyObject *args, PyObject * { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -21828,7 +24546,8 @@ static PyObject *_wrap_Window_ConvertPixelPointToDialog(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertPixelPointToDialog",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -21843,7 +24562,7 @@ static PyObject *_wrap_Window_ConvertPixelPointToDialog(PyObject *self, PyObject { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -21864,7 +24583,8 @@ static PyObject *_wrap_Window_ConvertPixelSizeToDialog(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ConvertPixelSizeToDialog",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -21879,7 +24599,7 @@ static PyObject *_wrap_Window_ConvertPixelSizeToDialog(PyObject *self, PyObject { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -21893,12 +24613,19 @@ static PyObject *_wrap_Window_WarpPointer(PyObject *self, PyObject *args, PyObje int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_WarpPointer",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_WarpPointer",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->WarpPointer(arg2,arg3); @@ -21922,7 +24649,8 @@ static PyObject *_wrap_Window_CaptureMouse(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_CaptureMouse",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CaptureMouse(); @@ -21946,7 +24674,8 @@ static PyObject *_wrap_Window_ReleaseMouse(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_ReleaseMouse",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ReleaseMouse(); @@ -21995,7 +24724,8 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_HasCapture",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->HasCapture(); @@ -22003,7 +24733,9 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22013,7 +24745,7 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; wxRect *arg3 = (wxRect *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22023,13 +24755,15 @@ static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Window_Refresh",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22057,7 +24791,8 @@ static PyObject *_wrap_Window_RefreshRect(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_RefreshRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -22085,7 +24820,8 @@ static PyObject *_wrap_Window_Update(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Update",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Update(); @@ -22109,7 +24845,8 @@ static PyObject *_wrap_Window_ClearBackground(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_ClearBackground",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearBackground(); @@ -22133,7 +24870,8 @@ static PyObject *_wrap_Window_Freeze(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Freeze",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Freeze(); @@ -22157,7 +24895,8 @@ static PyObject *_wrap_Window_Thaw(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Thaw",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Thaw(); @@ -22183,10 +24922,14 @@ static PyObject *_wrap_Window_PrepareDC(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_PrepareDC",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22212,7 +24955,8 @@ static PyObject *_wrap_Window_GetUpdateRegion(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetUpdateRegion",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -22223,7 +24967,7 @@ static PyObject *_wrap_Window_GetUpdateRegion(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRegion, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRegion, 0); return resultobj; fail: return NULL; @@ -22240,7 +24984,8 @@ static PyObject *_wrap_Window_GetUpdateClientRect(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetUpdateClientRect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetUpdateClientRect(); @@ -22251,7 +24996,7 @@ static PyObject *_wrap_Window_GetUpdateClientRect(PyObject *self, PyObject *args { wxRect * resultptr; resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1); } return resultobj; fail: @@ -22268,12 +25013,29 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject int arg5 = (int) 1 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|ii:Window_IsExposed",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_IsExposed",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsExposed(arg2,arg3,arg4,arg5); @@ -22281,7 +25043,9 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22301,7 +25065,8 @@ static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_IsExposedPoint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -22313,14 +25078,16 @@ static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_IsExposedRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxRect *arg2 = 0 ; @@ -22332,8 +25099,9 @@ static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyOb (char *) "self",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_isExposedRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_IsExposedRect",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -22345,7 +25113,9 @@ static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22365,7 +25135,8 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -22377,7 +25148,9 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22397,7 +25170,8 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetForegroundColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -22409,7 +25183,9 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22426,7 +25202,8 @@ static PyObject *_wrap_Window_GetBackgroundColour(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBackgroundColour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetBackgroundColour(); @@ -22437,7 +25214,7 @@ static PyObject *_wrap_Window_GetBackgroundColour(PyObject *self, PyObject *args { wxColour * resultptr; resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1); } return resultobj; fail: @@ -22455,7 +25232,8 @@ static PyObject *_wrap_Window_GetForegroundColour(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetForegroundColour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetForegroundColour(); @@ -22466,7 +25244,7 @@ static PyObject *_wrap_Window_GetForegroundColour(PyObject *self, PyObject *args { wxColour * resultptr; resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1); } return resultobj; fail: @@ -22486,10 +25264,14 @@ static PyObject *_wrap_Window_SetCursor(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetCursor",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxCursor, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22498,7 +25280,9 @@ static PyObject *_wrap_Window_SetCursor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22515,7 +25299,8 @@ static PyObject *_wrap_Window_GetCursor(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCursor",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -22526,7 +25311,10 @@ static PyObject *_wrap_Window_GetCursor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 0); + { + wxCursor* resultptr = new wxCursor(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxCursor, 1); + } return resultobj; fail: return NULL; @@ -22545,10 +25333,14 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22557,7 +25349,9 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22574,7 +25368,8 @@ static PyObject *_wrap_Window_GetFont(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetFont",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -22585,7 +25380,10 @@ static PyObject *_wrap_Window_GetFont(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); + { + wxFont* resultptr = new wxFont(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxFont, 1); + } return resultobj; fail: return NULL; @@ -22603,8 +25401,10 @@ static PyObject *_wrap_Window_SetCaret(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetCaret",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxCaret, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCaret(arg2); @@ -22629,7 +25429,8 @@ static PyObject *_wrap_Window_GetCaret(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCaret",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCaret *)((wxWindow const *)arg1)->GetCaret(); @@ -22637,7 +25438,7 @@ static PyObject *_wrap_Window_GetCaret(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCaret, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCaret, 0); return resultobj; fail: return NULL; @@ -22654,7 +25455,8 @@ static PyObject *_wrap_Window_GetCharHeight(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCharHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetCharHeight(); @@ -22662,7 +25464,7 @@ static PyObject *_wrap_Window_GetCharHeight(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -22679,7 +25481,8 @@ static PyObject *_wrap_Window_GetCharWidth(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetCharWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetCharWidth(); @@ -22687,7 +25490,7 @@ static PyObject *_wrap_Window_GetCharWidth(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -22700,7 +25503,7 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; int *arg3 = (int *) 0 ; int *arg4 = (int *) 0 ; - bool temp2 = false ; + bool temp2 = False ; int temp3 ; int temp4 ; PyObject * obj0 = 0 ; @@ -22712,11 +25515,12 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb arg3 = &temp3; arg4 = &temp4; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetTextExtent",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22757,7 +25561,7 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args, int *arg5 = (int *) 0 ; int *arg6 = (int *) 0 ; wxFont *arg7 = (wxFont *) NULL ; - bool temp2 = false ; + bool temp2 = False ; int temp3 ; int temp4 ; int temp5 ; @@ -22774,14 +25578,16 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args, arg5 = &temp5; arg6 = &temp6; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_GetFullTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg7, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg7),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22836,7 +25642,8 @@ static PyObject *_wrap_Window_ClientToScreenXY(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_ClientToScreenXY",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { temp2 = PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -22884,7 +25691,8 @@ static PyObject *_wrap_Window_ScreenToClientXY(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_ScreenToClientXY",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { temp2 = PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -22930,7 +25738,8 @@ static PyObject *_wrap_Window_ClientToScreen(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ClientToScreen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -22945,7 +25754,7 @@ static PyObject *_wrap_Window_ClientToScreen(PyObject *self, PyObject *args, PyO { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -22966,7 +25775,8 @@ static PyObject *_wrap_Window_ScreenToClient(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScreenToClient",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -22981,7 +25791,7 @@ static PyObject *_wrap_Window_ScreenToClient(PyObject *self, PyObject *args, PyO { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -22992,16 +25802,23 @@ static PyObject *_wrap_Window_ScreenToClient(PyObject *self, PyObject *args, PyO static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_HitTestXY",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->HitTest(arg2,arg3); @@ -23009,7 +25826,7 @@ static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -23029,7 +25846,8 @@ static PyObject *_wrap_Window_HitTest(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HitTest",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -23041,25 +25859,26 @@ static PyObject *_wrap_Window_HitTest(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_Window_GetBorderFlags(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_GetBorder__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; int result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flags", NULL - }; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_GetBorderFlags",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:Window_GetBorder",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetBorder(arg2); @@ -23067,24 +25886,22 @@ static PyObject *_wrap_Window_GetBorderFlags(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_GetBorder__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBorder",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:Window_GetBorder",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetBorder(); @@ -23092,24 +25909,78 @@ static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; } +static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 1) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_Window_GetBorder__SWIG_1(self,args); + } + } + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + _v = SWIG_CheckLong(argv[1]); + if (_v) { + return _wrap_Window_GetBorder__SWIG_0(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Window_GetBorder'"); + return NULL; +} + + static PyObject *_wrap_Window_UpdateWindowUI(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; long arg2 = (long) wxUPDATE_UI_NONE ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Window_UpdateWindowUI",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_UpdateWindowUI",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->UpdateWindowUI(arg2); @@ -23133,13 +26004,21 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "menu",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:Window_PopupMenuXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_PopupMenuXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->PopupMenu(arg2,arg3,arg4); @@ -23147,7 +26026,9 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23169,8 +26050,10 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; @@ -23182,7 +26065,9 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23199,7 +26084,8 @@ static PyObject *_wrap_Window_GetHandle(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetHandle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)wxWindow_GetHandle(arg1); @@ -23207,7 +26093,7 @@ static PyObject *_wrap_Window_GetHandle(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -23225,10 +26111,14 @@ static PyObject *_wrap_Window_OnPaint(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_OnPaint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPaintEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPaintEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23250,12 +26140,16 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_HasScrollbar",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasScrollbar",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->HasScrollbar(arg2); @@ -23263,7 +26157,9 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23277,17 +26173,30 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj int arg3 ; int arg4 ; int arg5 ; - bool arg6 = (bool) TRUE ; + bool arg6 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "orient",(char *) "pos",(char *) "thumbvisible",(char *) "range",(char *) "refresh", NULL + (char *) "self",(char *) "orientation",(char *) "pos",(char *) "thumbvisible",(char *) "range",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|O:Window_SetScrollbar",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = PyInt_AsLong(obj5) ? true : false; + arg6 = (bool) SWIG_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -23309,17 +26218,24 @@ static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObj wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; int arg3 ; - bool arg4 = (bool) TRUE ; + bool arg4 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "orient",(char *) "pos",(char *) "refresh", NULL + (char *) "self",(char *) "orientation",(char *) "pos",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Window_SetScrollPos",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_SetScrollPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; + arg4 = (bool) SWIG_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -23342,12 +26258,16 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "orient", NULL + (char *) "self",(char *) "orientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollPos",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollPos",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollPos(arg2); @@ -23355,7 +26275,7 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -23368,12 +26288,16 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "orient", NULL + (char *) "self",(char *) "orientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollThumb",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollThumb",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollThumb(arg2); @@ -23381,7 +26305,7 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -23394,12 +26318,16 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "orient", NULL + (char *) "self",(char *) "orientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollRange",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollRange",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollRange(arg2); @@ -23407,7 +26335,7 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -23421,15 +26349,23 @@ static PyObject *_wrap_Window_ScrollWindow(PyObject *self, PyObject *args, PyObj int arg3 ; wxRect *arg4 = (wxRect *) NULL ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Window_ScrollWindow",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_ScrollWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxRect, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23451,12 +26387,16 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lines", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_ScrollLines",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollLines",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollLines(arg2); @@ -23464,7 +26404,9 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23477,12 +26419,16 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pages", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_ScrollPages",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollPages",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollPages(arg2); @@ -23490,7 +26436,9 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23507,7 +26455,8 @@ static PyObject *_wrap_Window_LineUp(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_LineUp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LineUp(); @@ -23515,7 +26464,9 @@ static PyObject *_wrap_Window_LineUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23532,7 +26483,8 @@ static PyObject *_wrap_Window_LineDown(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_LineDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LineDown(); @@ -23540,7 +26492,9 @@ static PyObject *_wrap_Window_LineDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23557,7 +26511,8 @@ static PyObject *_wrap_Window_PageUp(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PageUp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->PageUp(); @@ -23565,7 +26520,9 @@ static PyObject *_wrap_Window_PageUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23582,7 +26539,8 @@ static PyObject *_wrap_Window_PageDown(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PageDown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->PageDown(); @@ -23590,7 +26548,9 @@ static PyObject *_wrap_Window_PageDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23601,7 +26561,7 @@ static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23609,11 +26569,12 @@ static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetHelpText",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23641,7 +26602,7 @@ static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, P PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23649,11 +26610,12 @@ static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetHelpTextForId",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23687,7 +26649,8 @@ static PyObject *_wrap_Window_GetHelpText(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetHelpText",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxWindow const *)arg1)->GetHelpText(); @@ -23712,7 +26675,7 @@ static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, P PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23720,11 +26683,12 @@ static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetToolTipString",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23759,8 +26723,10 @@ static PyObject *_wrap_Window_SetToolTip(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetToolTip",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxToolTip,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxToolTip, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToolTip(arg2); @@ -23785,7 +26751,8 @@ static PyObject *_wrap_Window_GetToolTip(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetToolTip",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolTip *)((wxWindow const *)arg1)->GetToolTip(); @@ -23805,7 +26772,7 @@ static PyObject *_wrap_Window_GetToolTip(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxDropTarget *arg2 = (wxDropTarget *) 0 ; + wxPyDropTarget *arg2 = (wxPyDropTarget *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23813,8 +26780,10 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDropTarget",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDropTarget, + SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDropTarget(arg2); @@ -23832,22 +26801,23 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_Window_GetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxDropTarget *result; + wxPyDropTarget *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetDropTarget",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDropTarget *)((wxWindow const *)arg1)->GetDropTarget(); + result = (wxPyDropTarget *)((wxWindow const *)arg1)->GetDropTarget(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxDropTarget, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDropTarget, 0); return resultobj; fail: return NULL; @@ -23865,8 +26835,9 @@ static PyObject *_wrap_Window_DragAcceptFiles(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DragAcceptFiles",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23893,8 +26864,10 @@ static PyObject *_wrap_Window_SetConstraints(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetConstraints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetConstraints(arg2); @@ -23919,7 +26892,8 @@ static PyObject *_wrap_Window_GetConstraints(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetConstraints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLayoutConstraints *)((wxWindow const *)arg1)->GetConstraints(); @@ -23927,7 +26901,7 @@ static PyObject *_wrap_Window_GetConstraints(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxLayoutConstraints, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLayoutConstraints, 0); return resultobj; fail: return NULL; @@ -23945,8 +26919,9 @@ static PyObject *_wrap_Window_SetAutoLayout(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetAutoLayout",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23972,7 +26947,8 @@ static PyObject *_wrap_Window_GetAutoLayout(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetAutoLayout",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->GetAutoLayout(); @@ -23980,7 +26956,9 @@ static PyObject *_wrap_Window_GetAutoLayout(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23997,7 +26975,8 @@ static PyObject *_wrap_Window_Layout(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Layout",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Layout(); @@ -24005,7 +26984,9 @@ static PyObject *_wrap_Window_Layout(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -24016,7 +26997,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxSizer *arg2 = (wxSizer *) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -24025,10 +27006,12 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizer",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -24049,7 +27032,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxSizer *arg2 = (wxSizer *) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -24058,10 +27041,12 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizerAndFit",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -24088,7 +27073,8 @@ static PyObject *_wrap_Window_GetSizer(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetSizer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizer *)((wxWindow const *)arg1)->GetSizer(); @@ -24116,8 +27102,10 @@ static PyObject *_wrap_Window_SetContainingSizer(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetContainingSizer",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetContainingSizer(arg2); @@ -24142,7 +27130,8 @@ static PyObject *_wrap_Window_GetContainingSizer(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetContainingSizer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizer *)((wxWindow const *)arg1)->GetContainingSizer(); @@ -24171,14 +27160,18 @@ static PyObject *_wrap_FindWindowById(PyObject *self, PyObject *args, PyObject * long arg1 ; wxWindow *arg2 = (wxWindow *) NULL ; wxWindow *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "parent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l|O:FindWindowById",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FindWindowById",kwnames,&obj0,&obj1)) goto fail; + arg1 = (long) SWIG_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24201,7 +27194,7 @@ static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject wxString *arg1 = 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxWindow *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -24212,10 +27205,11 @@ static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24246,7 +27240,7 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec wxString *arg1 = 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxWindow *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -24257,10 +27251,11 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24288,19 +27283,23 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_Window_FromHWND(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - unsigned long arg1 ; + wxWindow *arg1 = (wxWindow *) 0 ; + unsigned long arg2 ; wxWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "hWnd", NULL + (char *) "parent",(char *) "_hWnd", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_FromHWND",kwnames,&obj0)) goto fail; - arg1 = (unsigned long) PyInt_AsLong(obj0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FromHWND",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxWindow *)wxWindow_FromHWND(arg1); + result = (wxWindow *)wxWindow_FromHWND(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24348,7 +27347,8 @@ static PyObject *_wrap_Validator_Clone(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_Clone",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxValidator *)(arg1)->Clone(); @@ -24377,8 +27377,10 @@ static PyObject *_wrap_Validator_Validate(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Validator_Validate",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Validate(arg2); @@ -24386,7 +27388,9 @@ static PyObject *_wrap_Validator_Validate(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -24403,7 +27407,8 @@ static PyObject *_wrap_Validator_TransferToWindow(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_TransferToWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->TransferToWindow(); @@ -24411,7 +27416,9 @@ static PyObject *_wrap_Validator_TransferToWindow(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -24428,7 +27435,8 @@ static PyObject *_wrap_Validator_TransferFromWindow(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_TransferFromWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->TransferFromWindow(); @@ -24436,7 +27444,9 @@ static PyObject *_wrap_Validator_TransferFromWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -24453,7 +27463,8 @@ static PyObject *_wrap_Validator_GetWindow(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Validator_GetWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->GetWindow(); @@ -24481,8 +27492,10 @@ static PyObject *_wrap_Validator_SetWindow(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Validator_SetWindow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindow(arg2); @@ -24512,7 +27525,9 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -24521,12 +27536,17 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - int arg1 = (int) TRUE ; + int arg1 = (int) True ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "doIt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:Validator_SetBellOnError",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Validator_SetBellOnError",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxValidator::SetBellOnError(arg1); @@ -24563,7 +27583,7 @@ static PyObject *_wrap_new_PyValidator(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyValidator, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyValidator, 1); return resultobj; fail: return NULL; @@ -24575,18 +27595,24 @@ static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *ar wxPyValidator *arg1 = (wxPyValidator *) 0 ; PyObject *arg2 = (PyObject *) 0 ; PyObject *arg3 = (PyObject *) 0 ; - int arg4 = (int) TRUE ; + int arg4 = (int) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:PyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_setCallbackInfo(arg2,arg3,arg4); @@ -24617,7 +27643,7 @@ static int _wrap_DefaultValidator_set(PyObject *_val) { static PyObject *_wrap_DefaultValidator_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) &wxDefaultValidator, SWIGTYPE_p_wxValidator, 0); + pyobj = SWIG_NewPointerObj((void *)(&wxDefaultValidator), SWIGTYPE_p_wxValidator, 0); return pyobj; } @@ -24628,20 +27654,25 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxString *arg1 = (wxString *) &arg1_defvalue ; long arg2 = (long) 0 ; wxMenu *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Ol:new_Menu",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Menu",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } + if (obj1) { + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenu *)new wxMenu((wxString const &)*arg1,arg2); @@ -24674,37 +27705,49 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; int arg5 = (int) wxITEM_NORMAL ; - bool temp3 = false ; - bool temp4 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Append",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } + if (obj4) { + arg5 = (wxItemKind) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Append(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); + result = (wxMenuItem *)(arg1)->Append(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -24730,21 +27773,25 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_Menu_AppendSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenu *arg1 = (wxMenu *) 0 ; + wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_AppendSeparator",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AppendSeparator(); + result = (wxMenuItem *)(arg1)->AppendSeparator(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } return resultobj; fail: return NULL; @@ -24758,37 +27805,44 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AppendCheckItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); + result = (wxMenuItem *)(arg1)->AppendCheckItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -24818,37 +27872,44 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AppendRadioItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); + result = (wxMenuItem *)(arg1)->AppendRadioItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -24879,39 +27940,47 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject wxMenu *arg4 = (wxMenu *) 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp3 = false ; - bool temp5 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_AppendMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_AppendMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Append(arg2,(wxString const &)*arg3,arg4,(wxString const &)*arg5); + result = (wxMenuItem *)(arg1)->Append(arg2,(wxString const &)*arg3,arg4,(wxString const &)*arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -24938,6 +28007,7 @@ static PyObject *_wrap_Menu_AppendItem(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxMenu *arg1 = (wxMenu *) 0 ; wxMenuItem *arg2 = (wxMenuItem *) 0 ; + wxMenuItem *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -24945,16 +28015,20 @@ static PyObject *_wrap_Menu_AppendItem(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_AppendItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Append(arg2); + result = (wxMenuItem *)(arg1)->Append(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } return resultobj; fail: return NULL; @@ -24970,7 +28044,8 @@ static PyObject *_wrap_Menu_Break(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_Break",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Break(); @@ -24990,7 +28065,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *self, PyObject *args, PyObject wxMenu *arg1 = (wxMenu *) 0 ; size_t arg2 ; wxMenuItem *arg3 = (wxMenuItem *) 0 ; - bool result; + wxMenuItem *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -24999,18 +28074,22 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Insert(arg2,arg3); + result = (wxMenuItem *)(arg1)->Insert(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = wxPyMake_wxObject(result); + } return resultobj; fail: return NULL; @@ -25026,40 +28105,52 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; int arg6 = (int) wxITEM_NORMAL ; - bool temp4 = false ; - bool temp5 = false ; + wxMenuItem *result; + bool temp4 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|Oi:Menu_Insert",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Menu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } + if (obj5) { + arg6 = (wxItemKind) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Insert(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5,(wxItemKind )arg6); + result = (wxMenuItem *)(arg1)->Insert(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5,(wxItemKind )arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp4) delete arg4; @@ -25086,6 +28177,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxMenu *arg1 = (wxMenu *) 0 ; size_t arg2 ; + wxMenuItem *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -25093,17 +28185,20 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_InsertSeparator",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->InsertSeparator(arg2); + result = (wxMenuItem *)(arg1)->InsertSeparator(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } return resultobj; fail: return NULL; @@ -25118,40 +28213,47 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb wxString *arg4 = 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp4 = false ; - bool temp5 = false ; + wxMenuItem *result; + bool temp4 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->InsertCheckItem(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5); + result = (wxMenuItem *)(arg1)->InsertCheckItem(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp4) delete arg4; @@ -25182,40 +28284,47 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb wxString *arg4 = 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp4 = false ; - bool temp5 = false ; + wxMenuItem *result; + bool temp4 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->InsertRadioItem(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5); + result = (wxMenuItem *)(arg1)->InsertRadioItem(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp4) delete arg4; @@ -25247,42 +28356,50 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject wxMenu *arg5 = (wxMenu *) 0 ; wxString const &arg6_defvalue = wxPyEmptyString ; wxString *arg6 = (wxString *) &arg6_defvalue ; - bool temp4 = false ; - bool temp6 = false ; + wxMenuItem *result; + bool temp4 = False ; + bool temp6 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Insert(arg2,arg3,(wxString const &)*arg4,arg5,(wxString const &)*arg6); + result = (wxMenuItem *)(arg1)->Insert(arg2,arg3,(wxString const &)*arg4,arg5,(wxString const &)*arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp4) delete arg4; @@ -25309,6 +28426,7 @@ static PyObject *_wrap_Menu_PrependItem(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxMenu *arg1 = (wxMenu *) 0 ; wxMenuItem *arg2 = (wxMenuItem *) 0 ; + wxMenuItem *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -25316,16 +28434,20 @@ static PyObject *_wrap_Menu_PrependItem(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_PrependItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Prepend(arg2); + result = (wxMenuItem *)(arg1)->Prepend(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } return resultobj; fail: return NULL; @@ -25340,37 +28462,49 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; int arg5 = (int) wxITEM_NORMAL ; - bool temp3 = false ; - bool temp4 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Prepend",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } + if (obj4) { + arg5 = (wxItemKind) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Prepend(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); + result = (wxMenuItem *)(arg1)->Prepend(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -25396,21 +28530,25 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Menu_PrependSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenu *arg1 = (wxMenu *) 0 ; + wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_PrependSeparator",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->PrependSeparator(); + result = (wxMenuItem *)(arg1)->PrependSeparator(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } return resultobj; fail: return NULL; @@ -25424,37 +28562,44 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->PrependCheckItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); + result = (wxMenuItem *)(arg1)->PrependCheckItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -25484,37 +28629,44 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->PrependRadioItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); + result = (wxMenuItem *)(arg1)->PrependRadioItem(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -25545,39 +28697,47 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject wxMenu *arg4 = (wxMenu *) 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp3 = false ; - bool temp5 = false ; + wxMenuItem *result; + bool temp3 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_PrependMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_PrependMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Prepend(arg2,(wxString const &)*arg3,arg4,(wxString const &)*arg5); + result = (wxMenuItem *)(arg1)->Prepend(arg2,(wxString const &)*arg3,arg4,(wxString const &)*arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = wxPyMake_wxObject(result); + } { if (temp3) delete arg3; @@ -25606,12 +28766,16 @@ static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Remove",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Remove",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Remove(arg2); @@ -25640,8 +28804,10 @@ static PyObject *_wrap_Menu_RemoveItem(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_RemoveItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Remove(arg2); @@ -25664,12 +28830,16 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Delete",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Delete",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Delete(arg2); @@ -25677,7 +28847,9 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25696,8 +28868,10 @@ static PyObject *_wrap_Menu_DeleteItem(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DeleteItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Delete(arg2); @@ -25705,7 +28879,9 @@ static PyObject *_wrap_Menu_DeleteItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25721,7 +28897,8 @@ static PyObject *_wrap_Menu_Destroy(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_Destroy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMenu_Destroy(arg1); @@ -25742,12 +28919,16 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_DestroyId",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DestroyId",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Destroy(arg2); @@ -25755,7 +28936,9 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25774,8 +28957,10 @@ static PyObject *_wrap_Menu_DestroyItem(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DestroyItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Destroy(arg2); @@ -25783,7 +28968,9 @@ static PyObject *_wrap_Menu_DestroyItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25800,7 +28987,8 @@ static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetMenuItemCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (size_t)((wxMenu const *)arg1)->GetMenuItemCount(); @@ -25808,7 +28996,7 @@ static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -25825,7 +29013,8 @@ static PyObject *_wrap_Menu_GetMenuItems(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetMenuItems",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxMenu_GetMenuItems(arg1); @@ -25845,7 +29034,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k wxMenu *arg1 = (wxMenu *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -25853,11 +29042,12 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25866,7 +29056,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -25887,12 +29077,16 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObjec int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_FindItemById",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemById",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)((wxMenu const *)arg1)->FindItem(arg2); @@ -25921,8 +29115,9 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemByPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25946,14 +29141,18 @@ static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "enable", NULL + (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25975,12 +29174,16 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsEnabled",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsEnabled",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenu const *)arg1)->IsEnabled(arg2); @@ -25988,7 +29191,9 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26001,14 +29206,18 @@ static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwar int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "check", NULL + (char *) "self",(char *) "id",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26030,12 +29239,16 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsChecked",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsChecked",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenu const *)arg1)->IsChecked(arg2); @@ -26043,7 +29256,9 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26055,19 +29270,23 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k wxMenu *arg1 = (wxMenu *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "label", NULL + (char *) "self",(char *) "id",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26097,12 +29316,16 @@ static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *k int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetLabel",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetLabel",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenu const *)arg1)->GetLabel(arg2); @@ -26128,19 +29351,23 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje wxMenu *arg1 = (wxMenu *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "helpString", NULL + (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26170,12 +29397,16 @@ static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObje int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetHelpString",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetHelpString",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenu const *)arg1)->GetHelpString(arg2); @@ -26200,7 +29431,7 @@ static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxMenu *arg1 = (wxMenu *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -26208,11 +29439,12 @@ static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetTitle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26246,7 +29478,8 @@ static PyObject *_wrap_Menu_GetTitle(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetTitle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenu const *)arg1)->GetTitle(); @@ -26278,8 +29511,10 @@ static PyObject *_wrap_Menu_SetEventHandler(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetEventHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEventHandler(arg2); @@ -26304,7 +29539,8 @@ static PyObject *_wrap_Menu_GetEventHandler(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetEventHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxEvtHandler *)((wxMenu const *)arg1)->GetEventHandler(); @@ -26332,8 +29568,10 @@ static PyObject *_wrap_Menu_SetInvokingWindow(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetInvokingWindow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInvokingWindow(arg2); @@ -26358,7 +29596,8 @@ static PyObject *_wrap_Menu_GetInvokingWindow(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetInvokingWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)((wxMenu const *)arg1)->GetInvokingWindow(); @@ -26385,7 +29624,8 @@ static PyObject *_wrap_Menu_GetStyle(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetStyle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxMenu const *)arg1)->GetStyle(); @@ -26393,7 +29633,7 @@ static PyObject *_wrap_Menu_GetStyle(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -26411,9 +29651,11 @@ static PyObject *_wrap_Menu_UpdateUI(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Menu_UpdateUI",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26439,7 +29681,8 @@ static PyObject *_wrap_Menu_GetMenuBar(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetMenuBar",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuBar *)((wxMenu const *)arg1)->GetMenuBar(); @@ -26467,8 +29710,10 @@ static PyObject *_wrap_Menu_Attach(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Attach",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenuBarBase, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Attach(arg2); @@ -26492,7 +29737,8 @@ static PyObject *_wrap_Menu_Detach(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_Detach",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Detach(); @@ -26517,7 +29763,8 @@ static PyObject *_wrap_Menu_IsAttached(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_IsAttached",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenu const *)arg1)->IsAttached(); @@ -26525,7 +29772,9 @@ static PyObject *_wrap_Menu_IsAttached(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26543,8 +29792,10 @@ static PyObject *_wrap_Menu_SetParent(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_SetParent",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetParent(arg2); @@ -26569,7 +29820,8 @@ static PyObject *_wrap_Menu_GetParent(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Menu_GetParent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenu *)((wxMenu const *)arg1)->GetParent(); @@ -26597,11 +29849,16 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; long arg1 = (long) 0 ; wxMenuBar *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|l:new_MenuBar",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MenuBar",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (long) SWIG_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuBar *)new wxMenuBar(arg1); @@ -26624,7 +29881,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * wxMenu *arg2 = (wxMenu *) 0 ; wxString *arg3 = 0 ; bool result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26633,12 +29890,14 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Append",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26647,7 +29906,9 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp3) delete arg3; @@ -26669,7 +29930,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * wxMenu *arg3 = (wxMenu *) 0 ; wxString *arg4 = 0 ; bool result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26679,14 +29940,16 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26695,7 +29958,9 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp4) delete arg4; @@ -26720,7 +29985,8 @@ static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_GetMenuCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (size_t)((wxMenuBar const *)arg1)->GetMenuCount(); @@ -26728,7 +29994,7 @@ static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -26747,8 +30013,9 @@ static PyObject *_wrap_MenuBar_GetMenu(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetMenu",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26773,7 +30040,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject wxMenu *arg3 = (wxMenu *) 0 ; wxString *arg4 = 0 ; wxMenu *result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26783,14 +30050,16 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26828,8 +30097,9 @@ static PyObject *_wrap_MenuBar_Remove(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_Remove",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26860,10 +30130,11 @@ static PyObject *_wrap_MenuBar_EnableTop(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_EnableTop",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26891,8 +30162,9 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabledTop",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26901,7 +30173,9 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26913,7 +30187,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj wxMenuBar *arg1 = (wxMenuBar *) 0 ; size_t arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26922,13 +30196,14 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabelTop",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26964,8 +30239,9 @@ static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabelTop",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26993,8 +30269,8 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; wxString *arg3 = 0 ; int result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -27003,16 +30279,17 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_FindMenuItem",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27021,7 +30298,7 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -27050,12 +30327,16 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyOb int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_FindItemById",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_FindItemById",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)((wxMenuBar const *)arg1)->FindItem(arg2); @@ -27077,7 +30358,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject wxMenuBar *arg1 = (wxMenuBar *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -27085,11 +30366,12 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_FindMenu",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27098,7 +30380,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -27119,14 +30401,18 @@ static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject * int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "enable", NULL + (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27148,14 +30434,18 @@ static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *k int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "check", NULL + (char *) "self",(char *) "id",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27177,12 +30467,16 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsChecked",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsChecked",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuBar const *)arg1)->IsChecked(arg2); @@ -27190,7 +30484,9 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27203,12 +30499,16 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsEnabled",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabled",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuBar const *)arg1)->IsEnabled(arg2); @@ -27216,7 +30516,9 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27228,19 +30530,23 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject wxMenuBar *arg1 = (wxMenuBar *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "label", NULL + (char *) "self",(char *) "id",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27270,12 +30576,16 @@ static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetLabel",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabel",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenuBar const *)arg1)->GetLabel(arg2); @@ -27301,19 +30611,23 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO wxMenuBar *arg1 = (wxMenuBar *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "helpString", NULL + (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27343,12 +30657,16 @@ static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetHelpString",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetHelpString",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenuBar const *)arg1)->GetHelpString(arg2); @@ -27379,7 +30697,8 @@ static PyObject *_wrap_MenuBar_GetFrame(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_GetFrame",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFrame *)((wxMenuBar const *)arg1)->GetFrame(); @@ -27406,7 +30725,8 @@ static PyObject *_wrap_MenuBar_IsAttached(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_IsAttached",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuBar const *)arg1)->IsAttached(); @@ -27414,7 +30734,9 @@ static PyObject *_wrap_MenuBar_IsAttached(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27432,8 +30754,10 @@ static PyObject *_wrap_MenuBar_Attach(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_Attach",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFrame, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Attach(arg2); @@ -27457,7 +30781,8 @@ static PyObject *_wrap_MenuBar_Detach(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_Detach",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Detach(); @@ -27490,36 +30815,48 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw int arg5 = (int) wxITEM_NORMAL ; wxMenu *arg6 = (wxMenu *) NULL ; wxMenuItem *result; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parentMenu",(char *) "id",(char *) "text",(char *) "help",(char *) "kind",(char *) "subMenu", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiOOiO:new_MenuItem",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_MenuItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } + if (obj4) { + arg5 = (wxItemKind) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27563,7 +30900,8 @@ static PyObject *_wrap_MenuItem_GetMenu(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetMenu",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenu *)((wxMenuItem const *)arg1)->GetMenu(); @@ -27591,8 +30929,10 @@ static PyObject *_wrap_MenuItem_SetMenu(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetMenu",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMenu(arg2); @@ -27612,12 +30952,16 @@ static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject * wxMenuItem *arg1 = (wxMenuItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuItem_SetId",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetId",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -27642,7 +30986,8 @@ static PyObject *_wrap_MenuItem_GetId(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetId",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxMenuItem const *)arg1)->GetId(); @@ -27650,7 +30995,7 @@ static PyObject *_wrap_MenuItem_GetId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -27667,7 +31012,8 @@ static PyObject *_wrap_MenuItem_IsSeparator(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsSeparator",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuItem const *)arg1)->IsSeparator(); @@ -27675,7 +31021,9 @@ static PyObject *_wrap_MenuItem_IsSeparator(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27686,7 +31034,7 @@ static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -27694,11 +31042,12 @@ static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetText",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27732,7 +31081,8 @@ static PyObject *_wrap_MenuItem_GetLabel(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetLabel",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenuItem const *)arg1)->GetLabel(); @@ -27763,7 +31113,8 @@ static PyObject *_wrap_MenuItem_GetText(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetText",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -27774,7 +31125,13 @@ static PyObject *_wrap_MenuItem_GetText(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -27785,7 +31142,7 @@ static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args, PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "text", NULL @@ -27795,7 +31152,7 @@ static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27835,7 +31192,8 @@ static PyObject *_wrap_MenuItem_GetKind(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetKind",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxMenuItem const *)arg1)->GetKind(); @@ -27843,7 +31201,7 @@ static PyObject *_wrap_MenuItem_GetKind(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -27861,8 +31219,9 @@ static PyObject *_wrap_MenuItem_SetCheckable(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetCheckable",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27888,7 +31247,8 @@ static PyObject *_wrap_MenuItem_IsCheckable(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsCheckable",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuItem const *)arg1)->IsCheckable(); @@ -27896,7 +31256,9 @@ static PyObject *_wrap_MenuItem_IsCheckable(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27913,7 +31275,8 @@ static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsSubMenu",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuItem const *)arg1)->IsSubMenu(); @@ -27921,7 +31284,9 @@ static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27939,8 +31304,10 @@ static PyObject *_wrap_MenuItem_SetSubMenu(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetSubMenu",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSubMenu(arg2); @@ -27965,7 +31332,8 @@ static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetSubMenu",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenu *)((wxMenuItem const *)arg1)->GetSubMenu(); @@ -27985,7 +31353,7 @@ static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -27993,9 +31361,10 @@ static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MenuItem_Enable",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -28022,7 +31391,8 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsEnabled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuItem const *)arg1)->IsEnabled(); @@ -28030,7 +31400,9 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -28040,7 +31412,7 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28048,9 +31420,10 @@ static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MenuItem_Check",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -28077,7 +31450,8 @@ static PyObject *_wrap_MenuItem_IsChecked(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsChecked",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuItem const *)arg1)->IsChecked(); @@ -28085,7 +31459,9 @@ static PyObject *_wrap_MenuItem_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -28101,7 +31477,8 @@ static PyObject *_wrap_MenuItem_Toggle(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_Toggle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Toggle(); @@ -28120,7 +31497,7 @@ static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28128,11 +31505,12 @@ static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetHelp",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28166,7 +31544,8 @@ static PyObject *_wrap_MenuItem_GetHelp(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetHelp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -28177,7 +31556,13 @@ static PyObject *_wrap_MenuItem_GetHelp(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -28194,7 +31579,8 @@ static PyObject *_wrap_MenuItem_GetAccel(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetAccel",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxAcceleratorEntry *)((wxMenuItem const *)arg1)->GetAccel(); @@ -28202,7 +31588,7 @@ static PyObject *_wrap_MenuItem_GetAccel(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAcceleratorEntry, 0); return resultobj; fail: return NULL; @@ -28220,8 +31606,10 @@ static PyObject *_wrap_MenuItem_SetAccel(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetAccel",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxAcceleratorEntry, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAccel(arg2); @@ -28247,10 +31635,14 @@ static PyObject *_wrap_MenuItem_SetFont(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28276,7 +31668,8 @@ static PyObject *_wrap_MenuItem_GetFont(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetFont",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetFont(); @@ -28287,7 +31680,7 @@ static PyObject *_wrap_MenuItem_GetFont(PyObject *self, PyObject *args, PyObject { wxFont * resultptr; resultptr = new wxFont((wxFont &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxFont, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxFont, 1); } return resultobj; fail: @@ -28307,7 +31700,8 @@ static PyObject *_wrap_MenuItem_SetTextColour(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetTextColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -28336,7 +31730,8 @@ static PyObject *_wrap_MenuItem_GetTextColour(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetTextColour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetTextColour(); @@ -28347,7 +31742,7 @@ static PyObject *_wrap_MenuItem_GetTextColour(PyObject *self, PyObject *args, Py { wxColour * resultptr; resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1); } return resultobj; fail: @@ -28367,7 +31762,8 @@ static PyObject *_wrap_MenuItem_SetBackgroundColour(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -28396,7 +31792,8 @@ static PyObject *_wrap_MenuItem_GetBackgroundColour(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetBackgroundColour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBackgroundColour(); @@ -28407,7 +31804,7 @@ static PyObject *_wrap_MenuItem_GetBackgroundColour(PyObject *self, PyObject *ar { wxColour * resultptr; resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1); } return resultobj; fail: @@ -28429,15 +31826,22 @@ static PyObject *_wrap_MenuItem_SetBitmaps(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MenuItem_SetBitmaps",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } } { @@ -28465,10 +31869,14 @@ static PyObject *_wrap_MenuItem_SetDisabledBitmap(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetDisabledBitmap",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28494,7 +31902,8 @@ static PyObject *_wrap_MenuItem_GetDisabledBitmap(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetDisabledBitmap",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -28505,7 +31914,10 @@ static PyObject *_wrap_MenuItem_GetDisabledBitmap(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 0); + { + wxBitmap* resultptr = new wxBitmap(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1); + } return resultobj; fail: return NULL; @@ -28517,12 +31929,16 @@ static PyObject *_wrap_MenuItem_SetMarginWidth(PyObject *self, PyObject *args, P wxMenuItem *arg1 = (wxMenuItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nWidth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuItem_SetMarginWidth",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetMarginWidth",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMarginWidth(arg2); @@ -28547,7 +31963,8 @@ static PyObject *_wrap_MenuItem_GetMarginWidth(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetMarginWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetMarginWidth(); @@ -28555,7 +31972,7 @@ static PyObject *_wrap_MenuItem_GetMarginWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -28577,7 +31994,7 @@ static PyObject *_wrap_MenuItem_GetDefaultMarginWidth(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -28594,7 +32011,8 @@ static PyObject *_wrap_MenuItem_IsOwnerDrawn(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_IsOwnerDrawn",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsOwnerDrawn(); @@ -28602,7 +32020,9 @@ static PyObject *_wrap_MenuItem_IsOwnerDrawn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -28612,7 +32032,7 @@ static PyObject *_wrap_MenuItem_IsOwnerDrawn(PyObject *self, PyObject *args, PyO static PyObject *_wrap_MenuItem_SetOwnerDrawn(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28620,9 +32040,10 @@ static PyObject *_wrap_MenuItem_SetOwnerDrawn(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MenuItem_SetOwnerDrawn",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -28648,7 +32069,8 @@ static PyObject *_wrap_MenuItem_ResetOwnerDrawn(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_ResetOwnerDrawn",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ResetOwnerDrawn(); @@ -28674,10 +32096,14 @@ static PyObject *_wrap_MenuItem_SetBitmap(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetBitmap",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28703,7 +32129,8 @@ static PyObject *_wrap_MenuItem_GetBitmap(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuItem_GetBitmap",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -28714,7 +32141,10 @@ static PyObject *_wrap_MenuItem_GetBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 0); + { + wxBitmap* resultptr = new wxBitmap(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1); + } return resultobj; fail: return NULL; @@ -28728,10 +32158,30 @@ static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_ControlNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable ControlNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_ControlNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -28744,18 +32194,23 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxControl *result; wxPoint temp3 ; wxSize temp4 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlOO:new_Control",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:new_Control",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { { arg3 = &temp3; @@ -28768,17 +32223,24 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + arg5 = (long) SWIG_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg6 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -28833,7 +32295,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxControl *arg1 = (wxControl *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -28846,20 +32308,26 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp8 = false ; + bool temp8 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlOO:Control_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:Control_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxControl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { { arg4 = &temp4; @@ -28872,17 +32340,24 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + arg6 = (long) SWIG_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { - if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj6,(void **)(&arg7),SWIGTYPE_p_wxValidator, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg7 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } } if (obj7) { { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -28892,7 +32367,9 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp8) delete arg8; @@ -28918,10 +32395,14 @@ static PyObject *_wrap_Control_Command(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Control_Command",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxControl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxCommandEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28947,7 +32428,8 @@ static PyObject *_wrap_Control_GetLabel(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Control_GetLabel",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxControl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetLabel(); @@ -28972,7 +32454,7 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxControl *arg1 = (wxControl *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28980,11 +32462,12 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Control_SetLabel",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxControl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29021,7 +32504,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; PyObject *arg3 = (PyObject *) NULL ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -29030,11 +32513,12 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ItemContainer_Append",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { arg3 = obj2; @@ -29046,7 +32530,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -29065,6 +32549,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args, PyObject *resultobj; wxItemContainer *arg1 = (wxItemContainer *) 0 ; wxArrayString *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -29072,13 +32557,15 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_AppendItems",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { if (! PySequence_Check(obj1)) { PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); SWIG_fail; } arg2 = new wxArrayString; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; iClear(); @@ -29188,12 +32680,16 @@ static PyObject *_wrap_ItemContainer_Delete(PyObject *self, PyObject *args, PyOb wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_Delete",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Delete",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Delete(arg2); @@ -29218,7 +32714,8 @@ static PyObject *_wrap_ItemContainer_GetCount(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxItemContainer const *)arg1)->GetCount(); @@ -29226,7 +32723,7 @@ static PyObject *_wrap_ItemContainer_GetCount(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -29243,7 +32740,8 @@ static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_IsEmpty",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxItemContainer const *)arg1)->IsEmpty(); @@ -29251,7 +32749,9 @@ static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -29264,12 +32764,16 @@ static PyObject *_wrap_ItemContainer_GetString(PyObject *self, PyObject *args, P int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_GetString",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetString",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxItemContainer const *)arg1)->GetString(arg2); @@ -29300,7 +32804,8 @@ static PyObject *_wrap_ItemContainer_GetStrings(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetStrings",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxItemContainer const *)arg1)->GetStrings(); @@ -29322,19 +32827,23 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ItemContainer_SetString",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29363,7 +32872,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, wxItemContainer *arg1 = (wxItemContainer *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -29371,11 +32880,12 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_FindString",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29384,7 +32894,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -29404,12 +32914,16 @@ static PyObject *_wrap_ItemContainer_Select(PyObject *self, PyObject *args, PyOb wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_Select",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Select",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Select(arg2); @@ -29434,7 +32948,8 @@ static PyObject *_wrap_ItemContainer_GetSelection(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetSelection",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxItemContainer const *)arg1)->GetSelection(); @@ -29442,7 +32957,7 @@ static PyObject *_wrap_ItemContainer_GetSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -29459,7 +32974,8 @@ static PyObject *_wrap_ItemContainer_GetStringSelection(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ItemContainer_GetStringSelection",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxItemContainer const *)arg1)->GetStringSelection(); @@ -29486,12 +33002,16 @@ static PyObject *_wrap_ItemContainer_GetClientData(PyObject *self, PyObject *arg int arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_GetClientData",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetClientData",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxItemContainer_GetClientData(arg1,arg2); @@ -29512,13 +33032,17 @@ static PyObject *_wrap_ItemContainer_SetClientData(PyObject *self, PyObject *arg int arg2 ; PyObject *arg3 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ItemContainer_SetClientData",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetClientData",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29563,7 +33087,7 @@ static PyObject *_wrap_new_SizerItem(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 1); return resultobj; fail: return NULL; @@ -29579,13 +33103,29 @@ static PyObject *_wrap_new_SizerItemSpacer(PyObject *self, PyObject *args, PyObj int arg5 ; wxObject *arg6 = (wxObject *) 0 ; wxSizerItem *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiiiiO:new_SizerItemSpacer",kwnames,&arg1,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_SizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizerItem *)new wxSizerItem(arg1,arg2,arg3,arg4,arg5,arg6); @@ -29593,7 +33133,7 @@ static PyObject *_wrap_new_SizerItemSpacer(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 1); return resultobj; fail: return NULL; @@ -29609,14 +33149,25 @@ static PyObject *_wrap_new_SizerItemWindow(PyObject *self, PyObject *args, PyObj wxObject *arg5 = (wxObject *) 0 ; wxSizerItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "window",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:new_SizerItemWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_SizerItemWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizerItem *)new wxSizerItem(arg1,arg2,arg3,arg4,arg5); @@ -29624,7 +33175,7 @@ static PyObject *_wrap_new_SizerItemWindow(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 1); return resultobj; fail: return NULL; @@ -29640,14 +33191,25 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *self, PyObject *args, PyObje wxObject *arg5 = (wxObject *) 0 ; wxSizerItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "sizer",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:new_SizerItemSizer",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_SizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizerItem *)new wxSizerItem(arg1,arg2,arg3,arg4,arg5); @@ -29655,7 +33217,7 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 1); return resultobj; fail: return NULL; @@ -29671,7 +33233,8 @@ static PyObject *_wrap_SizerItem_DeleteWindows(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_DeleteWindows",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeleteWindows(); @@ -29695,7 +33258,8 @@ static PyObject *_wrap_SizerItem_DetachSizer(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_DetachSizer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DetachSizer(); @@ -29720,7 +33284,8 @@ static PyObject *_wrap_SizerItem_GetSize(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetSize(); @@ -29731,7 +33296,7 @@ static PyObject *_wrap_SizerItem_GetSize(PyObject *self, PyObject *args, PyObjec { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -29749,7 +33314,8 @@ static PyObject *_wrap_SizerItem_CalcMin(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_CalcMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcMin(); @@ -29760,7 +33326,7 @@ static PyObject *_wrap_SizerItem_CalcMin(PyObject *self, PyObject *args, PyObjec { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -29783,11 +33349,14 @@ static PyObject *_wrap_SizerItem_SetDimension(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetDimension",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&argp2),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg2 = *argp2; + if ((SWIG_ConvertPtr(obj2,(void **)(&argp3),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg3 = *argp3; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDimension(arg2,arg3); @@ -29812,7 +33381,8 @@ static PyObject *_wrap_SizerItem_GetMinSize(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetMinSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetMinSize(); @@ -29823,7 +33393,7 @@ static PyObject *_wrap_SizerItem_GetMinSize(PyObject *self, PyObject *args, PyOb { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -29837,12 +33407,19 @@ static PyObject *_wrap_SizerItem_SetInitSize(PyObject *self, PyObject *args, PyO int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SizerItem_SetInitSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetInitSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInitSize(arg2,arg3); @@ -29863,12 +33440,19 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SizerItem_SetRatioWH",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetRatioWH",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRatio(arg2,arg3); @@ -29895,9 +33479,11 @@ static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetRatioSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&argp2),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; + arg2 = *argp2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRatio(arg2); @@ -29917,12 +33503,16 @@ static PyObject *_wrap_SizerItem_SetRatio(PyObject *self, PyObject *args, PyObje wxSizerItem *arg1 = (wxSizerItem *) 0 ; float arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ratio", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Of:SizerItem_SetRatio",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetRatio",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (float) SWIG_AsFloat(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRatio(arg2); @@ -29947,7 +33537,8 @@ static PyObject *_wrap_SizerItem_GetRatio(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetRatio",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (float)(arg1)->GetRatio(); @@ -29955,7 +33546,7 @@ static PyObject *_wrap_SizerItem_GetRatio(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromFloat((float)result); return resultobj; fail: return NULL; @@ -29972,7 +33563,8 @@ static PyObject *_wrap_SizerItem_IsWindow(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsWindow(); @@ -29980,7 +33572,9 @@ static PyObject *_wrap_SizerItem_IsWindow(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -29997,7 +33591,8 @@ static PyObject *_wrap_SizerItem_IsSizer(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsSizer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsSizer(); @@ -30005,7 +33600,9 @@ static PyObject *_wrap_SizerItem_IsSizer(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -30022,7 +33619,8 @@ static PyObject *_wrap_SizerItem_IsSpacer(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsSpacer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsSpacer(); @@ -30030,7 +33628,9 @@ static PyObject *_wrap_SizerItem_IsSpacer(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -30042,12 +33642,16 @@ static PyObject *_wrap_SizerItem_SetProportion(PyObject *self, PyObject *args, P wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetProportion",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetProportion",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetProportion(arg2); @@ -30072,7 +33676,8 @@ static PyObject *_wrap_SizerItem_GetProportion(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetProportion",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetProportion(); @@ -30080,7 +33685,7 @@ static PyObject *_wrap_SizerItem_GetProportion(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -30092,12 +33697,16 @@ static PyObject *_wrap_SizerItem_SetFlag(PyObject *self, PyObject *args, PyObjec wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetFlag",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetFlag",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlag(arg2); @@ -30122,7 +33731,8 @@ static PyObject *_wrap_SizerItem_GetFlag(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetFlag",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetFlag(); @@ -30130,7 +33740,7 @@ static PyObject *_wrap_SizerItem_GetFlag(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -30142,12 +33752,16 @@ static PyObject *_wrap_SizerItem_SetBorder(PyObject *self, PyObject *args, PyObj wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetBorder",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetBorder",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorder(arg2); @@ -30172,7 +33786,8 @@ static PyObject *_wrap_SizerItem_GetBorder(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetBorder",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetBorder(); @@ -30180,7 +33795,7 @@ static PyObject *_wrap_SizerItem_GetBorder(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -30197,7 +33812,8 @@ static PyObject *_wrap_SizerItem_GetWindow(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->GetWindow(); @@ -30225,8 +33841,10 @@ static PyObject *_wrap_SizerItem_SetWindow(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetWindow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindow(arg2); @@ -30251,7 +33869,8 @@ static PyObject *_wrap_SizerItem_GetSizer(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetSizer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizer *)(arg1)->GetSizer(); @@ -30279,8 +33898,10 @@ static PyObject *_wrap_SizerItem_SetSizer(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSizer(arg2); @@ -30305,7 +33926,8 @@ static PyObject *_wrap_SizerItem_GetSpacer(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetSpacer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -30316,7 +33938,7 @@ static PyObject *_wrap_SizerItem_GetSpacer(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSize, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSize, 0); return resultobj; fail: return NULL; @@ -30335,7 +33957,8 @@ static PyObject *_wrap_SizerItem_SetSpacer(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -30365,8 +33988,9 @@ static PyObject *_wrap_SizerItem_Show(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_Show",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30392,7 +34016,8 @@ static PyObject *_wrap_SizerItem_IsShown(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_IsShown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsShown(); @@ -30400,7 +34025,9 @@ static PyObject *_wrap_SizerItem_IsShown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -30417,7 +34044,8 @@ static PyObject *_wrap_SizerItem_GetPosition(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPosition(); @@ -30428,7 +34056,7 @@ static PyObject *_wrap_SizerItem_GetPosition(PyObject *self, PyObject *args, PyO { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -30446,7 +34074,8 @@ static PyObject *_wrap_SizerItem_GetUserData(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetUserData",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxSizerItem_GetUserData(arg1); @@ -30479,7 +34108,8 @@ static PyObject *_wrap_Sizer__setOORInfo(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer__setOORInfo",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30505,14 +34135,30 @@ static PyObject *_wrap_Sizer_Add(PyObject *self, PyObject *args, PyObject *kwarg PyObject *arg6 = (PyObject *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiiO:Sizer_Add",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { arg6 = obj5; } @@ -30540,15 +34186,34 @@ static PyObject *_wrap_Sizer_Insert(PyObject *self, PyObject *args, PyObject *kw int arg6 = (int) 0 ; PyObject *arg7 = (PyObject *) NULL ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "before",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|iiiO:Sizer_Insert",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Sizer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; arg3 = obj2; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { arg7 = obj6; } @@ -30576,14 +34241,30 @@ static PyObject *_wrap_Sizer_Prepend(PyObject *self, PyObject *args, PyObject *k PyObject *arg6 = (PyObject *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiiO:Sizer_Prepend",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { arg6 = obj5; } @@ -30613,7 +34294,8 @@ static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_Remove",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30622,7 +34304,9 @@ static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -30633,8 +34317,8 @@ static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; - wxSize arg3 ; - wxSize *argp3 ; + wxSize *arg3 = 0 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -30643,13 +34327,16 @@ static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer__SetItemMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer__SetItemMinSize(arg1,arg2,arg3); + wxSizer__SetItemMinSize(arg1,arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30672,8 +34359,10 @@ static PyObject *_wrap_Sizer_AddItem(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_AddItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Add(arg2); @@ -30701,10 +34390,12 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Insert(arg2,arg3); @@ -30730,8 +34421,10 @@ static PyObject *_wrap_Sizer_PrependItem(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_PrependItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Prepend(arg2); @@ -30754,12 +34447,25 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Sizer_SetDimension",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Sizer_SetDimension",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDimension(arg2,arg3,arg4,arg5); @@ -30777,8 +34483,8 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; - wxSize arg2 ; - wxSize *argp2 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -30786,12 +34492,15 @@ static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetMinSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMinSize(arg2); + (arg1)->SetMinSize((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30813,7 +34522,8 @@ static PyObject *_wrap_Sizer_GetSize(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetSize(); @@ -30824,7 +34534,7 @@ static PyObject *_wrap_Sizer_GetSize(PyObject *self, PyObject *args, PyObject *k { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -30842,7 +34552,8 @@ static PyObject *_wrap_Sizer_GetPosition(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPosition(); @@ -30853,7 +34564,7 @@ static PyObject *_wrap_Sizer_GetPosition(PyObject *self, PyObject *args, PyObjec { wxPoint * resultptr; resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -30871,7 +34582,8 @@ static PyObject *_wrap_Sizer_GetMinSize(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetMinSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetMinSize(); @@ -30882,7 +34594,7 @@ static PyObject *_wrap_Sizer_GetMinSize(PyObject *self, PyObject *args, PyObject { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -30899,7 +34611,8 @@ static PyObject *_wrap_Sizer_RecalcSizes(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_RecalcSizes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RecalcSizes(); @@ -30924,7 +34637,8 @@ static PyObject *_wrap_Sizer_CalcMin(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_CalcMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcMin(); @@ -30935,7 +34649,7 @@ static PyObject *_wrap_Sizer_CalcMin(PyObject *self, PyObject *args, PyObject *k { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -30952,7 +34666,8 @@ static PyObject *_wrap_Sizer_Layout(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_Layout",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Layout(); @@ -30979,8 +34694,10 @@ static PyObject *_wrap_Sizer_Fit(PyObject *self, PyObject *args, PyObject *kwarg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_Fit",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->Fit(arg2); @@ -30991,7 +34708,7 @@ static PyObject *_wrap_Sizer_Fit(PyObject *self, PyObject *args, PyObject *kwarg { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -31010,8 +34727,10 @@ static PyObject *_wrap_Sizer_FitInside(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_FitInside",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FitInside(arg2); @@ -31037,8 +34756,10 @@ static PyObject *_wrap_Sizer_SetSizeHints(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetSizeHints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSizeHints(arg2); @@ -31064,8 +34785,10 @@ static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetVirtualSizeHints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVirtualSizeHints(arg2); @@ -31083,7 +34806,7 @@ static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *self, PyObject *args, static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -31091,9 +34814,10 @@ static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwa }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Sizer_Clear",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -31119,7 +34843,8 @@ static PyObject *_wrap_Sizer_DeleteWindows(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_DeleteWindows",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeleteWindows(); @@ -31144,7 +34869,8 @@ static PyObject *_wrap_Sizer_GetChildren(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sizer_GetChildren",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxSizer_GetChildren(arg1); @@ -31163,7 +34889,7 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -31172,10 +34898,11 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Sizer_Show",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + arg3 = (bool) SWIG_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -31203,7 +34930,8 @@ static PyObject *_wrap_Sizer_Hide(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_Hide",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31231,7 +34959,8 @@ static PyObject *_wrap_Sizer_IsShown(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_IsShown",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31240,7 +34969,9 @@ static PyObject *_wrap_Sizer_IsShown(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -31258,8 +34989,9 @@ static PyObject *_wrap_Sizer_ShowItems(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_ShowItems",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31297,7 +35029,7 @@ static PyObject *_wrap_new_PySizer(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPySizer, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPySizer, 1); return resultobj; fail: return NULL; @@ -31317,7 +35049,8 @@ static PyObject *_wrap_PySizer__setCallbackInfo(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PySizer__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPySizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPySizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -31345,11 +35078,16 @@ static PyObject *_wrap_new_BoxSizer(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; int arg1 = (int) wxHORIZONTAL ; wxBoxSizer *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_BoxSizer",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_BoxSizer",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBoxSizer *)new wxBoxSizer(arg1); @@ -31357,7 +35095,7 @@ static PyObject *_wrap_new_BoxSizer(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBoxSizer, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBoxSizer, 1); return resultobj; fail: return NULL; @@ -31374,7 +35112,8 @@ static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BoxSizer_GetOrientation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBoxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetOrientation(); @@ -31382,7 +35121,7 @@ static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -31394,12 +35133,16 @@ static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *self, PyObject *args, P wxBoxSizer *arg1 = (wxBoxSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:BoxSizer_SetOrientation",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BoxSizer_SetOrientation",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBoxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -31423,7 +35166,8 @@ static PyObject *_wrap_BoxSizer_RecalcSizes(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BoxSizer_RecalcSizes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBoxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RecalcSizes(); @@ -31448,7 +35192,8 @@ static PyObject *_wrap_BoxSizer_CalcMin(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BoxSizer_CalcMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBoxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcMin(); @@ -31459,7 +35204,7 @@ static PyObject *_wrap_BoxSizer_CalcMin(PyObject *self, PyObject *args, PyObject { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -31480,12 +35225,18 @@ static PyObject *_wrap_new_StaticBoxSizer(PyObject *self, PyObject *args, PyObje int arg2 = (int) wxHORIZONTAL ; wxStaticBoxSizer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "box",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_StaticBoxSizer",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_StaticBoxSizer",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStaticBox, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxStaticBoxSizer *)new wxStaticBoxSizer(arg1,arg2); @@ -31493,7 +35244,7 @@ static PyObject *_wrap_new_StaticBoxSizer(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxStaticBoxSizer, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBoxSizer, 1); return resultobj; fail: return NULL; @@ -31510,7 +35261,8 @@ static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticBoxSizer_GetStaticBox",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStaticBoxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxStaticBox *)(arg1)->GetStaticBox(); @@ -31536,7 +35288,8 @@ static PyObject *_wrap_StaticBoxSizer_RecalcSizes(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticBoxSizer_RecalcSizes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStaticBoxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RecalcSizes(); @@ -31561,7 +35314,8 @@ static PyObject *_wrap_StaticBoxSizer_CalcMin(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticBoxSizer_CalcMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStaticBoxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcMin(); @@ -31572,7 +35326,7 @@ static PyObject *_wrap_StaticBoxSizer_CalcMin(PyObject *self, PyObject *args, Py { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -31594,11 +35348,31 @@ static PyObject *_wrap_new_GridSizer(PyObject *self, PyObject *args, PyObject *k int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxGridSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_GridSizer",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_GridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridSizer *)new wxGridSizer(arg1,arg2,arg3,arg4); @@ -31606,7 +35380,7 @@ static PyObject *_wrap_new_GridSizer(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGridSizer, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGridSizer, 1); return resultobj; fail: return NULL; @@ -31622,7 +35396,8 @@ static PyObject *_wrap_GridSizer_RecalcSizes(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_RecalcSizes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RecalcSizes(); @@ -31647,7 +35422,8 @@ static PyObject *_wrap_GridSizer_CalcMin(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_CalcMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcMin(); @@ -31658,7 +35434,7 @@ static PyObject *_wrap_GridSizer_CalcMin(PyObject *self, PyObject *args, PyObjec { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -31671,12 +35447,16 @@ static PyObject *_wrap_GridSizer_SetCols(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetCols",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetCols",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCols(arg2); @@ -31696,12 +35476,16 @@ static PyObject *_wrap_GridSizer_SetRows(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetRows",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetRows",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRows(arg2); @@ -31721,12 +35505,16 @@ static PyObject *_wrap_GridSizer_SetVGap(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "gap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetVGap",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetVGap",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVGap(arg2); @@ -31746,12 +35534,16 @@ static PyObject *_wrap_GridSizer_SetHGap(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "gap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetHGap",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetHGap",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHGap(arg2); @@ -31776,7 +35568,8 @@ static PyObject *_wrap_GridSizer_GetCols(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetCols",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetCols(); @@ -31784,7 +35577,7 @@ static PyObject *_wrap_GridSizer_GetCols(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -31801,7 +35594,8 @@ static PyObject *_wrap_GridSizer_GetRows(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetRows",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetRows(); @@ -31809,7 +35603,7 @@ static PyObject *_wrap_GridSizer_GetRows(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -31826,7 +35620,8 @@ static PyObject *_wrap_GridSizer_GetVGap(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetVGap",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetVGap(); @@ -31834,7 +35629,7 @@ static PyObject *_wrap_GridSizer_GetVGap(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -31851,7 +35646,8 @@ static PyObject *_wrap_GridSizer_GetHGap(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridSizer_GetHGap",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetHGap(); @@ -31859,7 +35655,7 @@ static PyObject *_wrap_GridSizer_GetHGap(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -31880,11 +35676,31 @@ static PyObject *_wrap_new_FlexGridSizer(PyObject *self, PyObject *args, PyObjec int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxFlexGridSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_FlexGridSizer",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_FlexGridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFlexGridSizer *)new wxFlexGridSizer(arg1,arg2,arg3,arg4); @@ -31892,7 +35708,7 @@ static PyObject *_wrap_new_FlexGridSizer(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFlexGridSizer, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFlexGridSizer, 1); return resultobj; fail: return NULL; @@ -31908,7 +35724,8 @@ static PyObject *_wrap_FlexGridSizer_RecalcSizes(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_RecalcSizes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RecalcSizes(); @@ -31933,7 +35750,8 @@ static PyObject *_wrap_FlexGridSizer_CalcMin(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_CalcMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcMin(); @@ -31944,7 +35762,7 @@ static PyObject *_wrap_FlexGridSizer_CalcMin(PyObject *self, PyObject *args, PyO { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -31959,14 +35777,20 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *self, PyObject *ar int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "idx",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddGrowableRow(arg2,arg3); @@ -31992,8 +35816,9 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableRow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32016,14 +35841,20 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *self, PyObject *ar int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "idx",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddGrowableCol(arg2,arg3); @@ -32049,8 +35880,9 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableCol",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32071,12 +35903,16 @@ static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *self, PyObje wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlexibleDirection(arg2); @@ -32101,7 +35937,8 @@ static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetFlexibleDirection",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetFlexibleDirection(); @@ -32109,7 +35946,7 @@ static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -32121,12 +35958,16 @@ static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *self, PyOb wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (wxFlexSizerGrowMode) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNonFlexibleGrowMode((wxFlexSizerGrowMode )arg2); @@ -32151,7 +35992,8 @@ static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetNonFlexibleGrowMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetNonFlexibleGrowMode(); @@ -32159,7 +36001,81 @@ static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_FlexGridSizer_GetRowHeights(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; + wxArrayInt *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetRowHeights",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxArrayInt const &_result_ref = ((wxFlexGridSizer const *)arg1)->GetRowHeights(); + result = (wxArrayInt *) &_result_ref; + } + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = PyList_New(0); + size_t idx; + for (idx = 0; idx < result->GetCount(); idx += 1) { + PyObject* val = PyInt_FromLong( result->Item(idx) ); + PyList_Append(resultobj, val); + Py_DECREF(val); + } + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_FlexGridSizer_GetColWidths(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; + wxArrayInt *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetColWidths",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxArrayInt const &_result_ref = ((wxFlexGridSizer const *)arg1)->GetColWidths(); + result = (wxArrayInt *) &_result_ref; + } + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = PyList_New(0); + size_t idx; + for (idx = 0; idx < result->GetCount(); idx += 1) { + PyObject* val = PyInt_FromLong( result->Item(idx) ); + PyList_Append(resultobj, val); + Py_DECREF(val); + } + } return resultobj; fail: return NULL; @@ -32178,11 +36094,21 @@ static PyObject *_wrap_new_GBPosition(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGBPosition *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GBPosition",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBPosition",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBPosition *)new wxGBPosition(arg1,arg2); @@ -32190,7 +36116,7 @@ static PyObject *_wrap_new_GBPosition(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBPosition, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBPosition, 1); return resultobj; fail: return NULL; @@ -32207,7 +36133,8 @@ static PyObject *_wrap_GBPosition_GetRow(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_GetRow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxGBPosition const *)arg1)->GetRow(); @@ -32215,7 +36142,7 @@ static PyObject *_wrap_GBPosition_GetRow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -32232,7 +36159,8 @@ static PyObject *_wrap_GBPosition_GetCol(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_GetCol",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxGBPosition const *)arg1)->GetCol(); @@ -32240,7 +36168,7 @@ static PyObject *_wrap_GBPosition_GetCol(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -32252,12 +36180,16 @@ static PyObject *_wrap_GBPosition_SetRow(PyObject *self, PyObject *args, PyObjec wxGBPosition *arg1 = (wxGBPosition *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBPosition_SetRow",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetRow",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRow(arg2); @@ -32277,12 +36209,16 @@ static PyObject *_wrap_GBPosition_SetCol(PyObject *self, PyObject *args, PyObjec wxGBPosition *arg1 = (wxGBPosition *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBPosition_SetCol",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetCol",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCol(arg2); @@ -32306,23 +36242,26 @@ static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBPosition const *)arg1)->operator ==((wxGBPosition const &)*arg2); + result = (bool)(arg1)->operator ==((wxGBPosition const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32338,30 +36277,70 @@ static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition___ne__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBPosition const *)arg1)->operator !=((wxGBPosition const &)*arg2); + result = (bool)(arg1)->operator !=((wxGBPosition const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_GBPosition_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGBPosition *arg1 = (wxGBPosition *) 0 ; + int arg2 = (int) 0 ; + int arg3 = (int) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "row",(char *) "col", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBPosition_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGBPosition_Set(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_GBPosition_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBPosition *arg1 = (wxGBPosition *) 0 ; PyObject *result; @@ -32370,11 +36349,12 @@ static PyObject *_wrap_GBPosition_asTuple(PyObject *self, PyObject *args, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_asTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_Get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxGBPosition_asTuple(arg1); + result = (PyObject *)wxGBPosition_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -32398,11 +36378,21 @@ static PyObject *_wrap_new_GBSpan(PyObject *self, PyObject *args, PyObject *kwar int arg1 = (int) 1 ; int arg2 = (int) 1 ; wxGBSpan *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "rowspan",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GBSpan",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBSpan",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSpan *)new wxGBSpan(arg1,arg2); @@ -32410,7 +36400,7 @@ static PyObject *_wrap_new_GBSpan(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSpan, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSpan, 1); return resultobj; fail: return NULL; @@ -32427,7 +36417,8 @@ static PyObject *_wrap_GBSpan_GetRowspan(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_GetRowspan",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxGBSpan const *)arg1)->GetRowspan(); @@ -32435,7 +36426,7 @@ static PyObject *_wrap_GBSpan_GetRowspan(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -32452,7 +36443,8 @@ static PyObject *_wrap_GBSpan_GetColspan(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_GetColspan",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxGBSpan const *)arg1)->GetColspan(); @@ -32460,7 +36452,7 @@ static PyObject *_wrap_GBSpan_GetColspan(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -32472,12 +36464,16 @@ static PyObject *_wrap_GBSpan_SetRowspan(PyObject *self, PyObject *args, PyObjec wxGBSpan *arg1 = (wxGBSpan *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rowspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBSpan_SetRowspan",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetRowspan",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowspan(arg2); @@ -32497,12 +36493,16 @@ static PyObject *_wrap_GBSpan_SetColspan(PyObject *self, PyObject *args, PyObjec wxGBSpan *arg1 = (wxGBSpan *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBSpan_SetColspan",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetColspan",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColspan(arg2); @@ -32526,23 +36526,26 @@ static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "o", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan___eq__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBSpan const *)arg1)->operator ==((wxGBSpan const &)*arg2); + result = (bool)(arg1)->operator ==((wxGBSpan const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32558,30 +36561,70 @@ static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "o", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan___ne__",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBSpan const *)arg1)->operator !=((wxGBSpan const &)*arg2); + result = (bool)(arg1)->operator !=((wxGBSpan const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_GBSpan_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGBSpan *arg1 = (wxGBSpan *) 0 ; + int arg2 = (int) 1 ; + int arg3 = (int) 1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "rowspan",(char *) "colspan", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBSpan_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGBSpan_Set(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_GBSpan_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBSpan *arg1 = (wxGBSpan *) 0 ; PyObject *result; @@ -32590,11 +36633,12 @@ static PyObject *_wrap_GBSpan_asTuple(PyObject *self, PyObject *args, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_asTuple",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_Get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxGBSpan_asTuple(arg1); + result = (PyObject *)wxGBSpan_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -32622,7 +36666,7 @@ static int _wrap_DefaultSpan_set(PyObject *_val) { static PyObject *_wrap_DefaultSpan_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) &wxDefaultSpan, SWIGTYPE_p_wxGBSpan, 0); + pyobj = SWIG_NewPointerObj((void *)(&wxDefaultSpan), SWIGTYPE_p_wxGBSpan, 0); return pyobj; } @@ -32642,7 +36686,7 @@ static PyObject *_wrap_new_GBSizerItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 1); return resultobj; fail: return NULL; @@ -32663,13 +36707,16 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "window",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:new_GBSizerItemWindow",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GBSizerItemWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; @@ -32678,7 +36725,12 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; } - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSizerItem *)new wxGBSizerItem(arg1,(wxGBPosition const &)*arg2,(wxGBSpan const &)*arg3,arg4,arg5,arg6); @@ -32686,7 +36738,7 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 1); return resultobj; fail: return NULL; @@ -32707,13 +36759,16 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "sizer",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; @@ -32722,7 +36777,12 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; } - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSizerItem *)new wxGBSizerItem(arg1,(wxGBPosition const &)*arg2,(wxGBSpan const &)*arg3,arg4,arg5,arg6); @@ -32730,7 +36790,7 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 1); return resultobj; fail: return NULL; @@ -32749,14 +36809,22 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO wxGBSizerItem *result; wxGBPosition temp3 ; wxGBSpan temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiOOiiO:new_GBSizerItemSpacer",kwnames,&arg1,&arg2,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:new_GBSizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; if ( ! wxGBPosition_helper(obj2, &arg3)) SWIG_fail; @@ -32765,7 +36833,12 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO arg4 = &temp4; if ( ! wxGBSpan_helper(obj3, &arg4)) SWIG_fail; } - if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj6,(void **)(&arg7),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSizerItem *)new wxGBSizerItem(arg1,arg2,(wxGBPosition const &)*arg3,(wxGBSpan const &)*arg4,arg5,arg6,arg7); @@ -32773,7 +36846,7 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 1); return resultobj; fail: return NULL; @@ -32790,7 +36863,8 @@ static PyObject *_wrap_GBSizerItem_GetPos(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSizerItem_GetPos",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxGBSizerItem const *)arg1)->GetPos(); @@ -32801,7 +36875,7 @@ static PyObject *_wrap_GBSizerItem_GetPos(PyObject *self, PyObject *args, PyObje { wxGBPosition * resultptr; resultptr = new wxGBPosition((wxGBPosition &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBPosition, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBPosition, 1); } return resultobj; fail: @@ -32819,7 +36893,8 @@ static PyObject *_wrap_GBSizerItem_GetSpan(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSizerItem_GetSpan",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxGBSizerItem const *)arg1)->GetSpan(); @@ -32830,7 +36905,7 @@ static PyObject *_wrap_GBSizerItem_GetSpan(PyObject *self, PyObject *args, PyObj { wxGBSpan * resultptr; resultptr = new wxGBSpan((wxGBSpan &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBSpan, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBSpan, 1); } return resultobj; fail: @@ -32851,7 +36926,8 @@ static PyObject *_wrap_GBSizerItem_SetPos(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSizerItem_SetPos",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; @@ -32863,7 +36939,9 @@ static PyObject *_wrap_GBSizerItem_SetPos(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32883,7 +36961,8 @@ static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSizerItem_SetSpan",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail; @@ -32895,7 +36974,9 @@ static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32911,10 +36992,14 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_0(PyObject *self, PyObject * PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GBSizerItem_Intersects",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32923,7 +37008,9 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_0(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32943,7 +37030,8 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_1(PyObject *self, PyObject * PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO:GBSizerItem_Intersects",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; @@ -32959,7 +37047,9 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_1(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32979,7 +37069,7 @@ static PyObject *_wrap_GBSizerItem_Intersects(PyObject *self, PyObject *args) { int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -32989,7 +37079,7 @@ static PyObject *_wrap_GBSizerItem_Intersects(PyObject *self, PyObject *args) { if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33005,7 +37095,7 @@ static PyObject *_wrap_GBSizerItem_Intersects(PyObject *self, PyObject *args) { int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33045,14 +37135,21 @@ static PyObject *_wrap_GBSizerItem_GetEndPos(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GBSizerItem_GetEndPos",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_int,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_int, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_int,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_int, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33078,7 +37175,8 @@ static PyObject *_wrap_GBSizerItem_GetGBSizer(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSizerItem_GetGBSizer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridBagSizer *)((wxGBSizerItem const *)arg1)->GetGBSizer(); @@ -33086,7 +37184,7 @@ static PyObject *_wrap_GBSizerItem_GetGBSizer(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGridBagSizer, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGridBagSizer, 0); return resultobj; fail: return NULL; @@ -33104,8 +37202,10 @@ static PyObject *_wrap_GBSizerItem_SetGBSizer(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSizerItem_SetGBSizer",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetGBSizer(arg2); @@ -33132,11 +37232,21 @@ static PyObject *_wrap_new_GridBagSizer(PyObject *self, PyObject *args, PyObject int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGridBagSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridBagSizer",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridBagSizer",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridBagSizer *)new wxGridBagSizer(arg1,arg2); @@ -33144,7 +37254,7 @@ static PyObject *_wrap_new_GridBagSizer(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGridBagSizer, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGridBagSizer, 1); return resultobj; fail: return NULL; @@ -33168,13 +37278,16 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OiiO:GridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:GridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { arg3 = &temp3; @@ -33186,6 +37299,14 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject if ( ! wxGBSpan_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { arg7 = obj6; } @@ -33196,7 +37317,9 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33215,8 +37338,10 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_AddItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Add(arg2); @@ -33224,7 +37349,9 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33241,7 +37368,8 @@ static PyObject *_wrap_GridBagSizer_GetEmptyCellSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridBagSizer_GetEmptyCellSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxGridBagSizer const *)arg1)->GetEmptyCellSize(); @@ -33252,7 +37380,7 @@ static PyObject *_wrap_GridBagSizer_GetEmptyCellSize(PyObject *self, PyObject *a { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -33272,7 +37400,8 @@ static PyObject *_wrap_GridBagSizer_SetEmptyCellSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_SetEmptyCellSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; @@ -33300,8 +37429,10 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_0(PyObject *self, PyOb PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetItemPosition(arg2); @@ -33312,7 +37443,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_0(PyObject *self, PyOb { wxGBPosition * resultptr; resultptr = new wxGBPosition((wxGBPosition &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBPosition, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBPosition, 1); } return resultobj; fail: @@ -33329,8 +37460,10 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_1(PyObject *self, PyOb PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetItemPosition(arg2); @@ -33341,7 +37474,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_1(PyObject *self, PyOb { wxGBPosition * resultptr; resultptr = new wxGBPosition((wxGBPosition &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBPosition, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBPosition, 1); } return resultobj; fail: @@ -33358,8 +37491,9 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *self, PyOb PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33371,7 +37505,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *self, PyOb { wxGBPosition * resultptr; resultptr = new wxGBPosition((wxGBPosition &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBPosition, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBPosition, 1); } return resultobj; fail: @@ -33392,7 +37526,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33402,7 +37536,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33418,7 +37552,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33428,7 +37562,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33444,7 +37578,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33452,9 +37586,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar } } if (_v) { - { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; - } + _v = SWIG_CheckUnsignedLong(argv[1]); if (_v) { return _wrap_GridBagSizer_GetItemPosition__SWIG_2(self,args); } @@ -33478,8 +37610,10 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *self, PyOb PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg3 = &temp3; if ( ! wxGBPosition_helper(obj2, &arg3)) SWIG_fail; @@ -33491,7 +37625,9 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33510,8 +37646,10 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *self, PyOb PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg3 = &temp3; if ( ! wxGBPosition_helper(obj2, &arg3)) SWIG_fail; @@ -33523,7 +37661,9 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33542,8 +37682,9 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; @@ -33556,7 +37697,9 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33576,7 +37719,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33586,7 +37729,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33607,7 +37750,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33617,7 +37760,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33638,7 +37781,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33646,9 +37789,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar } } if (_v) { - { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; - } + _v = SWIG_CheckUnsignedLong(argv[1]); if (_v) { { _v = wxPySimple_typecheck(argv[2], wxT("wxGBPosition"), 2); @@ -33674,8 +37815,10 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_0(PyObject *self, PyObject PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetItemSpan(arg2); @@ -33686,7 +37829,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_0(PyObject *self, PyObject { wxGBSpan * resultptr; resultptr = new wxGBSpan((wxGBSpan &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBSpan, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBSpan, 1); } return resultobj; fail: @@ -33703,8 +37846,10 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_1(PyObject *self, PyObject PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetItemSpan(arg2); @@ -33715,7 +37860,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_1(PyObject *self, PyObject { wxGBSpan * resultptr; resultptr = new wxGBSpan((wxGBSpan &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBSpan, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBSpan, 1); } return resultobj; fail: @@ -33732,8 +37877,9 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *self, PyObject PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33745,7 +37891,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *self, PyObject { wxGBSpan * resultptr; resultptr = new wxGBSpan((wxGBSpan &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxGBSpan, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxGBSpan, 1); } return resultobj; fail: @@ -33766,7 +37912,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33776,7 +37922,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33792,7 +37938,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33802,7 +37948,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33818,7 +37964,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33826,9 +37972,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) } } if (_v) { - { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; - } + _v = SWIG_CheckUnsignedLong(argv[1]); if (_v) { return _wrap_GridBagSizer_GetItemSpan__SWIG_2(self,args); } @@ -33852,8 +37996,10 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *self, PyObject PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; @@ -33865,7 +38011,9 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33884,8 +38032,10 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *self, PyObject PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; @@ -33897,7 +38047,9 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33916,8 +38068,9 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (size_t) SWIG_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; @@ -33930,7 +38083,9 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -33950,7 +38105,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33960,7 +38115,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33981,7 +38136,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -33991,7 +38146,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34012,7 +38167,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34020,9 +38175,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) } } if (_v) { - { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; - } + _v = SWIG_CheckUnsignedLong(argv[1]); if (_v) { { _v = wxPySimple_typecheck(argv[2], wxT("wxGBSpan"), 2); @@ -34048,8 +38201,10 @@ static PyObject *_wrap_GridBagSizer_FindItem__SWIG_0(PyObject *self, PyObject *a PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_FindItem",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSizerItem *)(arg1)->FindItem(arg2); @@ -34057,7 +38212,7 @@ static PyObject *_wrap_GridBagSizer_FindItem__SWIG_0(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 0); return resultobj; fail: return NULL; @@ -34073,8 +38228,10 @@ static PyObject *_wrap_GridBagSizer_FindItem__SWIG_1(PyObject *self, PyObject *a PyObject * obj1 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_FindItem",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSizerItem *)(arg1)->FindItem(arg2); @@ -34082,7 +38239,7 @@ static PyObject *_wrap_GridBagSizer_FindItem__SWIG_1(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 0); return resultobj; fail: return NULL; @@ -34102,7 +38259,7 @@ static PyObject *_wrap_GridBagSizer_FindItem(PyObject *self, PyObject *args) { int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34112,7 +38269,7 @@ static PyObject *_wrap_GridBagSizer_FindItem(PyObject *self, PyObject *args) { if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34128,7 +38285,7 @@ static PyObject *_wrap_GridBagSizer_FindItem(PyObject *self, PyObject *args) { int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34138,7 +38295,7 @@ static PyObject *_wrap_GridBagSizer_FindItem(PyObject *self, PyObject *args) { if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34169,7 +38326,8 @@ static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_FindItemAtPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; @@ -34181,7 +38339,40 @@ static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_GridBagSizer_FindItemAtPoint(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ; + wxPoint *arg2 = 0 ; + wxGBSizerItem *result; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pt", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_FindItemAtPoint",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGBSizerItem *)(arg1)->FindItemAtPoint((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 0); return resultobj; fail: return NULL; @@ -34200,8 +38391,10 @@ static PyObject *_wrap_GridBagSizer_FindItemWithData(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_FindItemWithData",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxObject, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSizerItem *)(arg1)->FindItemWithData((wxObject const *)arg2); @@ -34209,7 +38402,7 @@ static PyObject *_wrap_GridBagSizer_FindItemWithData(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 0); return resultobj; fail: return NULL; @@ -34225,7 +38418,8 @@ static PyObject *_wrap_GridBagSizer_RecalcSizes(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridBagSizer_RecalcSizes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RecalcSizes(); @@ -34250,7 +38444,8 @@ static PyObject *_wrap_GridBagSizer_CalcMin(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridBagSizer_CalcMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcMin(); @@ -34261,7 +38456,7 @@ static PyObject *_wrap_GridBagSizer_CalcMin(PyObject *self, PyObject *args, PyOb { wxSize * resultptr; resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -34280,10 +38475,13 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_0(PyObject *self, PyObject * obj2 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OO|O:GridBagSizer_CheckForIntersection",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -34292,7 +38490,9 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_0(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -34314,7 +38514,8 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_1(PyObject *self, PyObject * obj3 = 0 ; if(!PyArg_ParseTuple(args,(char *)"OOO|O:GridBagSizer_CheckForIntersection",&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; @@ -34324,7 +38525,8 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_1(PyObject *self, if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; } if (obj3) { - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGBSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxGBSizerItem, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -34333,7 +38535,9 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_1(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -34353,7 +38557,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *self, PyObjec int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34363,7 +38567,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *self, PyObjec if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { + if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34376,7 +38580,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *self, PyObjec } { void *ptr; - if (SWIG_ConvertPtr(argv[2], (void **) &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { + if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34393,7 +38597,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *self, PyObjec int _v; { void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxGridBagSizer, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34414,7 +38618,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *self, PyObjec } { void *ptr; - if (SWIG_ConvertPtr(argv[3], (void **) &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { + if (SWIG_ConvertPtr(argv[3], &ptr, SWIGTYPE_p_wxGBSizerItem, 0) == -1) { _v = 0; PyErr_Clear(); } else { @@ -34450,14 +38654,32 @@ static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *self, PyObject * int arg5 = (int) 0 ; int arg6 = (int) wxLAYOUT_DEFAULT_MARGIN ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rel",(char *) "otherW",(char *) "otherE",(char *) "val",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOi|ii:IndividualLayoutConstraint_Set",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:IndividualLayoutConstraint_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (wxRelationship) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (wxEdge) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set((wxRelationship )arg2,arg3,(wxEdge )arg4,arg5,arg6); @@ -34479,13 +38701,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *self, PyObjec int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->LeftOf(arg2,arg3); @@ -34507,13 +38736,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *self, PyObje int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RightOf(arg2,arg3); @@ -34535,13 +38771,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *self, PyObject int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Above(arg2,arg3); @@ -34563,13 +38806,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *self, PyObject int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Below(arg2,arg3); @@ -34592,13 +38842,23 @@ static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *self, PyObjec int arg4 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "otherW",(char *) "edge",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|i:IndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:IndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (wxEdge) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SameAs(arg2,(wxEdge )arg3,arg4); @@ -34621,13 +38881,21 @@ static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *self, PyOb int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "otherW",(char *) "wh",(char *) "per", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:IndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (wxEdge) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PercentOf(arg2,(wxEdge )arg3,arg4); @@ -34647,12 +38915,16 @@ static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *self, PyObj wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Absolute(arg2); @@ -34676,7 +38948,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_Unconstrained(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_Unconstrained",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Unconstrained(); @@ -34700,7 +38973,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_AsIs(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_AsIs",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AsIs(); @@ -34725,7 +38999,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetOtherWindow(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetOtherWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->GetOtherWindow(); @@ -34752,7 +39027,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetMyEdge",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxIndividualLayoutConstraint const *)arg1)->GetMyEdge(); @@ -34760,7 +39036,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -34772,12 +39048,16 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *self, PyObje wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (wxEdge) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEdge((wxEdge )arg2); @@ -34797,12 +39077,16 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *self, PyObj wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -34827,7 +39111,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetMargin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetMargin(); @@ -34835,7 +39120,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -34847,12 +39132,16 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *self, PyOb wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargin(arg2); @@ -34877,7 +39166,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetValue",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxIndividualLayoutConstraint const *)arg1)->GetValue(); @@ -34885,7 +39175,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -34902,7 +39192,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetPercent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxIndividualLayoutConstraint const *)arg1)->GetPercent(); @@ -34910,7 +39201,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -34927,7 +39218,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetOtherEdge",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxIndividualLayoutConstraint const *)arg1)->GetOtherEdge(); @@ -34935,7 +39227,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -34952,7 +39244,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetDone",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxIndividualLayoutConstraint const *)arg1)->GetDone(); @@ -34960,7 +39253,9 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -34978,8 +39273,9 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetDone",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -35005,7 +39301,8 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *self }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IndividualLayoutConstraint_GetRelationship",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetRelationship(); @@ -35013,7 +39310,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *self wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -35025,12 +39322,16 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *self wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "r", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (wxRelationship) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRelationship((wxRelationship )arg2); @@ -35057,8 +39358,10 @@ static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_ResetIfWin",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ResetIfWin(arg2); @@ -35066,7 +39369,9 @@ static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -35087,9 +39392,12 @@ static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *se }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IndividualLayoutConstraint_SatisfyConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SatisfyConstraint(arg2,arg3); @@ -35097,7 +39405,9 @@ static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -35112,16 +39422,22 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje wxWindow *arg4 = (wxWindow *) 0 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which",(char *) "thisWin",(char *) "other", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (wxEdge) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxIndividualLayoutConstraint const *)arg1)->GetEdge((wxEdge )arg2,arg3,arg4); @@ -35129,7 +39445,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -35153,10 +39469,11 @@ static PyObject *_wrap_LayoutConstraints_left_get(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_left_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->left); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35173,10 +39490,11 @@ static PyObject *_wrap_LayoutConstraints_top_get(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_top_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->top); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35193,10 +39511,11 @@ static PyObject *_wrap_LayoutConstraints_right_get(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_right_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->right); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35213,10 +39532,11 @@ static PyObject *_wrap_LayoutConstraints_bottom_get(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_bottom_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->bottom); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35233,10 +39553,11 @@ static PyObject *_wrap_LayoutConstraints_width_get(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_width_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->width); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35253,10 +39574,11 @@ static PyObject *_wrap_LayoutConstraints_height_get(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_height_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->height); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35273,10 +39595,11 @@ static PyObject *_wrap_LayoutConstraints_centreX_get(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_centreX_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->centreX); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35293,10 +39616,11 @@ static PyObject *_wrap_LayoutConstraints_centreY_get(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_centreY_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (wxIndividualLayoutConstraint *)& ((arg1)->centreY); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIndividualLayoutConstraint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIndividualLayoutConstraint, 0); return resultobj; fail: return NULL; @@ -35318,7 +39642,7 @@ static PyObject *_wrap_new_LayoutConstraints(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxLayoutConstraints, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLayoutConstraints, 1); return resultobj; fail: return NULL; @@ -35340,8 +39664,10 @@ static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *self, PyOb arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LayoutConstraints_SatisfyConstraints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SatisfyConstraints(arg2,arg3); @@ -35349,7 +39675,9 @@ static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -35370,7 +39698,8 @@ static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LayoutConstraints_AreSatisfied",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLayoutConstraints,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxLayoutConstraints const *)arg1)->AreSatisfied(); @@ -35378,7 +39707,9 @@ static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -35394,6 +39725,7 @@ static PyObject * LayoutConstraints_swigregister(PyObject *self, PyObject *args) } static PyMethodDef SwigMethods[] = { { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS }, + { (char *)"_wxPyFixStockObjects", __wxPyFixStockObjects, METH_VARARGS }, { (char *)"Object_GetClassName", (PyCFunction) _wrap_Object_GetClassName, METH_VARARGS | METH_KEYWORDS }, { (char *)"Object_Destroy", (PyCFunction) _wrap_Object_Destroy, METH_VARARGS | METH_KEYWORDS }, { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS }, @@ -35414,9 +39746,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Size_GetX", (PyCFunction) _wrap_Size_GetX, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Size_GetY", (PyCFunction) _wrap_Size_GetY, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Size_asTuple", (PyCFunction) _wrap_Size_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS }, { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint_x_get", (PyCFunction) _wrap_RealPoint_x_get, METH_VARARGS | METH_KEYWORDS }, @@ -35424,12 +39754,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"RealPoint_y_get", (PyCFunction) _wrap_RealPoint_y_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_RealPoint", (PyCFunction) _wrap_new_RealPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_RealPoint", (PyCFunction) _wrap_delete_RealPoint, METH_VARARGS | METH_KEYWORDS }, - { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint___eq__", (PyCFunction) _wrap_RealPoint___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint___ne__", (PyCFunction) _wrap_RealPoint___ne__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint_Set", (PyCFunction) _wrap_RealPoint_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"RealPoint_asTuple", (PyCFunction) _wrap_RealPoint_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"RealPoint_Get", (PyCFunction) _wrap_RealPoint_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint_swigregister", RealPoint_swigregister, METH_VARARGS }, { (char *)"Point_x_set", (PyCFunction) _wrap_Point_x_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point_x_get", (PyCFunction) _wrap_Point_x_get, METH_VARARGS | METH_KEYWORDS }, @@ -35444,7 +39774,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Point___iadd__", (PyCFunction) _wrap_Point___iadd__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point___isub__", (PyCFunction) _wrap_Point___isub__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point_Set", (PyCFunction) _wrap_Point_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point_asTuple", (PyCFunction) _wrap_Point_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Point_Get", (PyCFunction) _wrap_Point_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point_swigregister", Point_swigregister, METH_VARARGS }, { (char *)"new_Rect", (PyCFunction) _wrap_new_Rect, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_RectPP", (PyCFunction) _wrap_new_RectPP, METH_VARARGS | METH_KEYWORDS }, @@ -35462,6 +39792,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect_SetPosition", (PyCFunction) _wrap_Rect_SetPosition, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetSize", (PyCFunction) _wrap_Rect_GetSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_SetSize", (PyCFunction) _wrap_Rect_SetSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_GetTopLeft", (PyCFunction) _wrap_Rect_GetTopLeft, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_SetTopLeft", (PyCFunction) _wrap_Rect_SetTopLeft, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_GetBottomRight", (PyCFunction) _wrap_Rect_GetBottomRight, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_SetBottomRight", (PyCFunction) _wrap_Rect_SetBottomRight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetLeft", (PyCFunction) _wrap_Rect_GetLeft, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetTop", (PyCFunction) _wrap_Rect_GetTop, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetBottom", (PyCFunction) _wrap_Rect_GetBottom, METH_VARARGS | METH_KEYWORDS }, @@ -35491,7 +39825,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect_height_set", (PyCFunction) _wrap_Rect_height_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_height_get", (PyCFunction) _wrap_Rect_height_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_Set", (PyCFunction) _wrap_Rect_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Rect_asTuple", (PyCFunction) _wrap_Rect_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_Get", (PyCFunction) _wrap_Rect_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_swigregister", Rect_swigregister, METH_VARARGS }, { (char *)"IntersectRect", (PyCFunction) _wrap_IntersectRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_Point2D", (PyCFunction) _wrap_new_Point2D, METH_VARARGS | METH_KEYWORDS }, @@ -35514,16 +39848,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"Point2D___idiv__", (PyCFunction) _wrap_Point2D___idiv__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D___eq__", (PyCFunction) _wrap_Point2D___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D___ne__", (PyCFunction) _wrap_Point2D___ne__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_x_set", (PyCFunction) _wrap_Point2D_m_x_set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_x_get", (PyCFunction) _wrap_Point2D_m_x_get, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_y_set", (PyCFunction) _wrap_Point2D_m_y_set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_y_get", (PyCFunction) _wrap_Point2D_m_y_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_x_set", (PyCFunction) _wrap_Point2D_x_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_x_get", (PyCFunction) _wrap_Point2D_x_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_y_set", (PyCFunction) _wrap_Point2D_y_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_y_get", (PyCFunction) _wrap_Point2D_y_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_Set", (PyCFunction) _wrap_Point2D_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_asTuple", (PyCFunction) _wrap_Point2D_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS }, { (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS }, { (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS }, @@ -36028,7 +40358,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyApp_Dispatch", (PyCFunction) _wrap_PyApp_Dispatch, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_ProcessIdle", (PyCFunction) _wrap_PyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SendIdleEvents", (PyCFunction) _wrap_PyApp_SendIdleEvents, METH_VARARGS | METH_KEYWORDS }, - { (char *)"PyApp_OnIdle", (PyCFunction) _wrap_PyApp_OnIdle, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_IsActive", (PyCFunction) _wrap_PyApp_IsActive, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SetTopWindow", (PyCFunction) _wrap_PyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetTopWindow", (PyCFunction) _wrap_PyApp_GetTopWindow, METH_VARARGS | METH_KEYWORDS }, @@ -36038,8 +40367,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyApp_GetUseBestVisual", (PyCFunction) _wrap_PyApp_GetUseBestVisual, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SetPrintMode", (PyCFunction) _wrap_PyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetPrintMode", (PyCFunction) _wrap_PyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS }, - { (char *)"PyApp_GetAssertMode", (PyCFunction) _wrap_PyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SetAssertMode", (PyCFunction) _wrap_PyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PyApp_GetAssertMode", (PyCFunction) _wrap_PyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS }, @@ -36061,6 +40390,20 @@ static PyMethodDef SwigMethods[] = { { (char *)"PostEvent", (PyCFunction) _wrap_PostEvent, METH_VARARGS | METH_KEYWORDS }, { (char *)"App_CleanUp", (PyCFunction) _wrap_App_CleanUp, METH_VARARGS | METH_KEYWORDS }, { (char *)"GetApp", (PyCFunction) _wrap_GetApp, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, + { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_SetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_SetMenuItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_GetMenuItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS }, + { (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS }, + { (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS }, + { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS }, @@ -36074,6 +40417,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetLabel", (PyCFunction) _wrap_Window_GetLabel, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetName", (PyCFunction) _wrap_Window_SetName, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetName", (PyCFunction) _wrap_Window_GetName, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetWindowVariant", (PyCFunction) _wrap_Window_SetWindowVariant, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetWindowVariant", (PyCFunction) _wrap_Window_GetWindowVariant, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetId", (PyCFunction) _wrap_Window_SetId, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetId", (PyCFunction) _wrap_Window_GetId, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_NewControlId", (PyCFunction) _wrap_Window_NewControlId, METH_VARARGS | METH_KEYWORDS }, @@ -36127,8 +40472,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_IsEnabled", (PyCFunction) _wrap_Window_IsEnabled, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetWindowStyleFlag", (PyCFunction) _wrap_Window_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetWindowStyleFlag", (PyCFunction) _wrap_Window_GetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetWindowStyle", (PyCFunction) _wrap_Window_SetWindowStyle, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetWindowStyle", (PyCFunction) _wrap_Window_GetWindowStyle, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_HasFlag", (PyCFunction) _wrap_Window_HasFlag, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_IsRetained", (PyCFunction) _wrap_Window_IsRetained, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetExtraStyle", (PyCFunction) _wrap_Window_SetExtraStyle, METH_VARARGS | METH_KEYWORDS }, @@ -36136,7 +40479,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_MakeModal", (PyCFunction) _wrap_Window_MakeModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetThemeEnabled", (PyCFunction) _wrap_Window_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetThemeEnabled", (PyCFunction) _wrap_Window_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_ShouldInheritColours", (PyCFunction) _wrap_Window_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetFocus", (PyCFunction) _wrap_Window_SetFocus, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetFocusFromKbd", (PyCFunction) _wrap_Window_SetFocusFromKbd, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_FindFocus", (PyCFunction) _wrap_Window_FindFocus, METH_VARARGS | METH_KEYWORDS }, @@ -36187,7 +40529,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetUpdateClientRect", (PyCFunction) _wrap_Window_GetUpdateClientRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_IsExposed", (PyCFunction) _wrap_Window_IsExposed, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_IsExposedPoint", (PyCFunction) _wrap_Window_IsExposedPoint, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_isExposedRect", (PyCFunction) _wrap_Window_isExposedRect, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_IsExposedRect", (PyCFunction) _wrap_Window_IsExposedRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, @@ -36208,8 +40550,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_ScreenToClient", (PyCFunction) _wrap_Window_ScreenToClient, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_HitTestXY", (PyCFunction) _wrap_Window_HitTestXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_HitTest", (PyCFunction) _wrap_Window_HitTest, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetBorderFlags", (PyCFunction) _wrap_Window_GetBorderFlags, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetBorder", (PyCFunction) _wrap_Window_GetBorder, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetBorder", _wrap_Window_GetBorder, METH_VARARGS }, { (char *)"Window_UpdateWindowUI", (PyCFunction) _wrap_Window_UpdateWindowUI, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_PopupMenuXY", (PyCFunction) _wrap_Window_PopupMenuXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_PopupMenu", (PyCFunction) _wrap_Window_PopupMenu, METH_VARARGS | METH_KEYWORDS }, @@ -36516,6 +40857,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"FlexGridSizer_GetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_GetFlexibleDirection, METH_VARARGS | METH_KEYWORDS }, { (char *)"FlexGridSizer_SetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_SetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"FlexGridSizer_GetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_GetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"FlexGridSizer_GetRowHeights", (PyCFunction) _wrap_FlexGridSizer_GetRowHeights, METH_VARARGS | METH_KEYWORDS }, + { (char *)"FlexGridSizer_GetColWidths", (PyCFunction) _wrap_FlexGridSizer_GetColWidths, METH_VARARGS | METH_KEYWORDS }, { (char *)"FlexGridSizer_swigregister", FlexGridSizer_swigregister, METH_VARARGS }, { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS }, @@ -36524,7 +40867,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBPosition_SetCol", (PyCFunction) _wrap_GBPosition_SetCol, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition___eq__", (PyCFunction) _wrap_GBPosition___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition___ne__", (PyCFunction) _wrap_GBPosition___ne__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GBPosition_asTuple", (PyCFunction) _wrap_GBPosition_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBPosition_Set", (PyCFunction) _wrap_GBPosition_Set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS }, { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS }, @@ -36533,7 +40877,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBSpan_SetColspan", (PyCFunction) _wrap_GBSpan_SetColspan, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan___eq__", (PyCFunction) _wrap_GBSpan___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan___ne__", (PyCFunction) _wrap_GBSpan___ne__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GBSpan_asTuple", (PyCFunction) _wrap_GBSpan_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBSpan_Set", (PyCFunction) _wrap_GBSpan_Set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS }, { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS }, @@ -36559,6 +40904,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridBagSizer_SetItemSpan", _wrap_GridBagSizer_SetItemSpan, METH_VARARGS }, { (char *)"GridBagSizer_FindItem", _wrap_GridBagSizer_FindItem, METH_VARARGS }, { (char *)"GridBagSizer_FindItemAtPosition", (PyCFunction) _wrap_GridBagSizer_FindItemAtPosition, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GridBagSizer_FindItemAtPoint", (PyCFunction) _wrap_GridBagSizer_FindItemAtPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridBagSizer_FindItemWithData", (PyCFunction) _wrap_GridBagSizer_FindItemWithData, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridBagSizer_RecalcSizes", (PyCFunction) _wrap_GridBagSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridBagSizer_CalcMin", (PyCFunction) _wrap_GridBagSizer_CalcMin, METH_VARARGS | METH_KEYWORDS }, @@ -36903,6 +41249,9 @@ static void *_p_wxWindowTo_p_wxObject(void *x) { static void *_p_wxControlTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxControl *) x)); } +static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) { + return (void *)((wxObject *) ((wxAcceleratorTable *) x)); +} static void *_p_wxGridSizerTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizer *) ((wxGridSizer *) x)); } @@ -37092,120 +41441,120 @@ static void *_p_wxPyCommandEventTo_p_wxCommandEvent(void *x) { static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { return (void *)((wxValidator *) ((wxPyValidator *) x)); } -static swig_type_info _swigt__p_wxLayoutConstraints[] = {{"_p_wxLayoutConstraints", 0, "wxLayoutConstraints *", 0},{"_p_wxLayoutConstraints"},{0}}; -static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0},{"_p_wxRealPoint"},{0}}; -static swig_type_info _swigt__p_wxSizerItem[] = {{"_p_wxSizerItem", 0, "wxSizerItem *", 0},{"_p_wxSizerItem"},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxSizerItem},{0}}; -static swig_type_info _swigt__p_wxGBSizerItem[] = {{"_p_wxGBSizerItem", 0, "wxGBSizerItem *", 0},{"_p_wxGBSizerItem"},{0}}; -static swig_type_info _swigt__p_wxScrollEvent[] = {{"_p_wxScrollEvent", 0, "wxScrollEvent *", 0},{"_p_wxScrollEvent"},{0}}; -static swig_type_info _swigt__p_wxIndividualLayoutConstraint[] = {{"_p_wxIndividualLayoutConstraint", 0, "wxIndividualLayoutConstraint *", 0},{"_p_wxIndividualLayoutConstraint"},{0}}; -static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0},{"_p_wxSizer"},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer},{0}}; -static swig_type_info _swigt__p_wxBoxSizer[] = {{"_p_wxBoxSizer", 0, "wxBoxSizer *", 0},{"_p_wxBoxSizer"},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxBoxSizer},{0}}; -static swig_type_info _swigt__p_wxStaticBoxSizer[] = {{"_p_wxStaticBoxSizer", 0, "wxStaticBoxSizer *", 0},{"_p_wxStaticBoxSizer"},{0}}; -static swig_type_info _swigt__p_wxGridBagSizer[] = {{"_p_wxGridBagSizer", 0, "wxGridBagSizer *", 0},{"_p_wxGridBagSizer"},{0}}; -static swig_type_info _swigt__p_wxAcceleratorEntry[] = {{"_p_wxAcceleratorEntry", 0, "wxAcceleratorEntry *", 0},{"_p_wxAcceleratorEntry"},{0}}; -static swig_type_info _swigt__p_wxUpdateUIEvent[] = {{"_p_wxUpdateUIEvent", 0, "wxUpdateUIEvent *", 0},{"_p_wxUpdateUIEvent"},{0}}; -static swig_type_info _swigt__p_wxMenu[] = {{"_p_wxMenu", 0, "wxMenu *", 0},{"_p_wxMenu"},{0}}; -static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; -static swig_type_info _swigt__p_wxGridSizer[] = {{"_p_wxGridSizer", 0, "wxGridSizer *", 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxGridSizer},{"_p_wxGridSizer"},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxGridSizer},{0}}; -static swig_type_info _swigt__p_wxFlexGridSizer[] = {{"_p_wxFlexGridSizer", 0, "wxFlexGridSizer *", 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxFlexGridSizer},{"_p_wxFlexGridSizer"},{0}}; -static swig_type_info _swigt__p_wxInitDialogEvent[] = {{"_p_wxInitDialogEvent", 0, "wxInitDialogEvent *", 0},{"_p_wxInitDialogEvent"},{0}}; -static swig_type_info _swigt__p_wxItemContainer[] = {{"_p_wxItemContainer", 0, "wxItemContainer *", 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxItemContainer},{"_p_wxItemContainer"},{0}}; -static swig_type_info _swigt__p_wxNcPaintEvent[] = {{"_p_wxNcPaintEvent", 0, "wxNcPaintEvent *", 0},{"_p_wxNcPaintEvent"},{0}}; -static swig_type_info _swigt__p_wxPaintEvent[] = {{"_p_wxPaintEvent", 0, "wxPaintEvent *", 0},{"_p_wxPaintEvent"},{0}}; -static swig_type_info _swigt__p_wxSysColourChangedEvent[] = {{"_p_wxSysColourChangedEvent", 0, "wxSysColourChangedEvent *", 0},{"_p_wxSysColourChangedEvent"},{0}}; -static swig_type_info _swigt__p_wxMouseCaptureChangedEvent[] = {{"_p_wxMouseCaptureChangedEvent", 0, "wxMouseCaptureChangedEvent *", 0},{"_p_wxMouseCaptureChangedEvent"},{0}}; -static swig_type_info _swigt__p_wxDisplayChangedEvent[] = {{"_p_wxDisplayChangedEvent", 0, "wxDisplayChangedEvent *", 0},{"_p_wxDisplayChangedEvent"},{0}}; -static swig_type_info _swigt__p_wxPaletteChangedEvent[] = {{"_p_wxPaletteChangedEvent", 0, "wxPaletteChangedEvent *", 0},{"_p_wxPaletteChangedEvent"},{0}}; -static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *", 0},{"_p_wxControl"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxControl},{0}}; -static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; -static swig_type_info _swigt__p_wxMenuBarBase[] = {{"_p_wxMenuBarBase", 0, "wxMenuBarBase *", 0},{"_p_wxMenuBarBase"},{0}}; -static swig_type_info _swigt__p_wxSetCursorEvent[] = {{"_p_wxSetCursorEvent", 0, "wxSetCursorEvent *", 0},{"_p_wxSetCursorEvent"},{0}}; -static swig_type_info _swigt__p_wxFSFile[] = {{"_p_wxFSFile", 0, "wxFSFile *", 0},{"_p_wxFSFile"},{0}}; -static swig_type_info _swigt__p_wxCaret[] = {{"_p_wxCaret", 0, "wxCaret *", 0},{"_p_wxCaret"},{0}}; -static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0},{"_p_wxRegion"},{0}}; -static swig_type_info _swigt__p_wxPoint2D[] = {{"_p_wxPoint2D", 0, "wxPoint2D *", 0},{"_p_wxPoint2D"},{0}}; -static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; -static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p_wxSize"},{0}}; -static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; -static swig_type_info _swigt__p_wxPySizer[] = {{"_p_wxPySizer", 0, "wxPySizer *", 0},{"_p_wxPySizer"},{0}}; -static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxNotifyEvent"},{0}}; -static swig_type_info _swigt__p_wxPyEvent[] = {{"_p_wxPyEvent", 0, "wxPyEvent *", 0},{"_p_wxPyEvent"},{0}}; -static swig_type_info _swigt__p_wxPropagationDisabler[] = {{"_p_wxPropagationDisabler", 0, "wxPropagationDisabler *", 0},{"_p_wxPropagationDisabler"},{0}}; -static swig_type_info _swigt__p_wxAppTraits[] = {{"_p_wxAppTraits", 0, "wxAppTraits *", 0},{"_p_wxAppTraits"},{0}}; -static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxArrayString *", 0},{"_p_wxArrayString"},{0}}; -static swig_type_info _swigt__p_wxShowEvent[] = {{"_p_wxShowEvent", 0, "wxShowEvent *", 0},{"_p_wxShowEvent"},{0}}; -static swig_type_info _swigt__p_wxToolTip[] = {{"_p_wxToolTip", 0, "wxToolTip *", 0},{"_p_wxToolTip"},{0}}; -static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0},{"_p_wxMaximizeEvent"},{0}}; -static swig_type_info _swigt__p_wxIconizeEvent[] = {{"_p_wxIconizeEvent", 0, "wxIconizeEvent *", 0},{"_p_wxIconizeEvent"},{0}}; -static swig_type_info _swigt__p_wxActivateEvent[] = {{"_p_wxActivateEvent", 0, "wxActivateEvent *", 0},{"_p_wxActivateEvent"},{0}}; -static swig_type_info _swigt__p_wxMoveEvent[] = {{"_p_wxMoveEvent", 0, "wxMoveEvent *", 0},{"_p_wxMoveEvent"},{0}}; -static swig_type_info _swigt__p_wxSizeEvent[] = {{"_p_wxSizeEvent", 0, "wxSizeEvent *", 0},{"_p_wxSizeEvent"},{0}}; -static swig_type_info _swigt__p_wxQueryNewPaletteEvent[] = {{"_p_wxQueryNewPaletteEvent", 0, "wxQueryNewPaletteEvent *", 0},{"_p_wxQueryNewPaletteEvent"},{0}}; -static swig_type_info _swigt__p_wxWindowCreateEvent[] = {{"_p_wxWindowCreateEvent", 0, "wxWindowCreateEvent *", 0},{"_p_wxWindowCreateEvent"},{0}}; -static swig_type_info _swigt__p_wxIdleEvent[] = {{"_p_wxIdleEvent", 0, "wxIdleEvent *", 0},{"_p_wxIdleEvent"},{0}}; -static swig_type_info _swigt__p_wxMenuItem[] = {{"_p_wxMenuItem", 0, "wxMenuItem *", 0},{"_p_wxMenuItem"},{0}}; -static swig_type_info _swigt__p_wxStaticBox[] = {{"_p_wxStaticBox", 0, "wxStaticBox *", 0},{"_p_wxStaticBox"},{0}}; -static swig_type_info _swigt__p_long[] = {{"_p_long", 0, "long *", 0},{"_p_long"},{0}}; -static swig_type_info _swigt__p_wxTIFFHandler[] = {{"_p_wxTIFFHandler", 0, "wxTIFFHandler *", 0},{"_p_wxTIFFHandler"},{0}}; -static swig_type_info _swigt__p_wxXPMHandler[] = {{"_p_wxXPMHandler", 0, "wxXPMHandler *", 0},{"_p_wxXPMHandler"},{0}}; -static swig_type_info _swigt__p_wxPNMHandler[] = {{"_p_wxPNMHandler", 0, "wxPNMHandler *", 0},{"_p_wxPNMHandler"},{0}}; -static swig_type_info _swigt__p_wxJPEGHandler[] = {{"_p_wxJPEGHandler", 0, "wxJPEGHandler *", 0},{"_p_wxJPEGHandler"},{0}}; -static swig_type_info _swigt__p_wxPCXHandler[] = {{"_p_wxPCXHandler", 0, "wxPCXHandler *", 0},{"_p_wxPCXHandler"},{0}}; -static swig_type_info _swigt__p_wxGIFHandler[] = {{"_p_wxGIFHandler", 0, "wxGIFHandler *", 0},{"_p_wxGIFHandler"},{0}}; -static swig_type_info _swigt__p_wxPNGHandler[] = {{"_p_wxPNGHandler", 0, "wxPNGHandler *", 0},{"_p_wxPNGHandler"},{0}}; -static swig_type_info _swigt__p_wxANIHandler[] = {{"_p_wxANIHandler", 0, "wxANIHandler *", 0},{"_p_wxANIHandler"},{0}}; -static swig_type_info _swigt__p_wxMemoryFSHandler[] = {{"_p_wxMemoryFSHandler", 0, "wxMemoryFSHandler *", 0},{"_p_wxMemoryFSHandler"},{0}}; -static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{0}}; -static swig_type_info _swigt__p_wxCURHandler[] = {{"_p_wxCURHandler", 0, "wxCURHandler *", 0},{"_p_wxCURHandler"},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxCURHandler},{0}}; -static swig_type_info _swigt__p_wxICOHandler[] = {{"_p_wxICOHandler", 0, "wxICOHandler *", 0},{"_p_wxICOHandler"},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxICOHandler},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxICOHandler},{0}}; -static swig_type_info _swigt__p_wxBMPHandler[] = {{"_p_wxBMPHandler", 0, "wxBMPHandler *", 0},{"_p_wxBMPHandler"},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxBMPHandler},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxBMPHandler},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxBMPHandler},{0}}; -static swig_type_info _swigt__p_wxImageHandler[] = {{"_p_wxImageHandler", 0, "wxImageHandler *", 0},{"_p_wxImageHandler"},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxImageHandler},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxImageHandler},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxImageHandler},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxImageHandler},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxImageHandler},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxImageHandler},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxImageHandler},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxImageHandler},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxImageHandler},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxImageHandler},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxImageHandler},{0}}; -static swig_type_info _swigt__p_wxFileSystemHandler[] = {{"_p_wxFileSystemHandler", 0, "wxFileSystemHandler *", 0},{"_p_wxFileSystemHandler"},{"_p_wxPyFileSystemHandler", _p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler},{"_p_wxInternetFSHandler", _p_wxInternetFSHandlerTo_p_wxFileSystemHandler},{"_p_wxZipFSHandler", _p_wxZipFSHandlerTo_p_wxFileSystemHandler},{"_p_wxMemoryFSHandler", _p_wxMemoryFSHandlerTo_p_wxFileSystemHandler},{0}}; -static swig_type_info _swigt__p_wxPyFileSystemHandler[] = {{"_p_wxPyFileSystemHandler", 0, "wxPyFileSystemHandler *", 0},{"_p_wxPyFileSystemHandler"},{0}}; -static swig_type_info _swigt__p_wxInternetFSHandler[] = {{"_p_wxInternetFSHandler", 0, "wxInternetFSHandler *", 0},{"_p_wxInternetFSHandler"},{0}}; -static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0},{"_p_wxZipFSHandler"},{0}}; -static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; -static swig_type_info _swigt__p_wxGBSpan[] = {{"_p_wxGBSpan", 0, "wxGBSpan *", 0},{"_p_wxGBSpan"},{0}}; -static swig_type_info _swigt__p_wxPropagateOnce[] = {{"_p_wxPropagateOnce", 0, "wxPropagateOnce *", 0},{"_p_wxPropagateOnce"},{0}}; -static swig_type_info _swigt__p_wxAcceleratorTable[] = {{"_p_wxAcceleratorTable", 0, "wxAcceleratorTable *", 0},{"_p_wxAcceleratorTable"},{0}}; -static swig_type_info _swigt__p_wxGBPosition[] = {{"_p_wxGBPosition", 0, "wxGBPosition *", 0},{"_p_wxGBPosition"},{0}}; -static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0},{"_p_wxImage"},{0}}; -static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxFrame"},{0}}; -static swig_type_info _swigt__p_wxScrollWinEvent[] = {{"_p_wxScrollWinEvent", 0, "wxScrollWinEvent *", 0},{"_p_wxScrollWinEvent"},{0}}; -static swig_type_info _swigt__p_wxImageHistogram[] = {{"_p_wxImageHistogram", 0, "wxImageHistogram *", 0},{"_p_wxImageHistogram"},{0}}; -static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; -static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}}; -static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{0}}; -static swig_type_info _swigt__p_wxPyInputStream[] = {{"_p_wxPyInputStream", 0, "wxPyInputStream *", 0},{"_p_wxPyInputStream"},{0}}; -static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0},{"_p_wxOutputStream"},{0}}; -static swig_type_info _swigt__p_wxInputStream[] = {{"_p_wxInputStream", 0, "wxInputStream *", 0},{"_p_wxInputStream"},{0}}; -static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0},{"_p_wxDateTime"},{0}}; -static swig_type_info _swigt__p_wxKeyEvent[] = {{"_p_wxKeyEvent", 0, "wxKeyEvent *", 0},{"_p_wxKeyEvent"},{0}}; -static swig_type_info _swigt__p_wxNavigationKeyEvent[] = {{"_p_wxNavigationKeyEvent", 0, "wxNavigationKeyEvent *", 0},{"_p_wxNavigationKeyEvent"},{0}}; -static swig_type_info _swigt__p_wxWindowDestroyEvent[] = {{"_p_wxWindowDestroyEvent", 0, "wxWindowDestroyEvent *", 0},{"_p_wxWindowDestroyEvent"},{0}}; -static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{0}}; -static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0},{"_p_wxMenuBar"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; -static swig_type_info _swigt__p_wxFileSystem[] = {{"_p_wxFileSystem", 0, "wxFileSystem *", 0},{"_p_wxFileSystem"},{0}}; -static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; -static swig_type_info _swigt__p_wxMenuEvent[] = {{"_p_wxMenuEvent", 0, "wxMenuEvent *", 0},{"_p_wxMenuEvent"},{0}}; -static swig_type_info _swigt__p_wxContextMenuEvent[] = {{"_p_wxContextMenuEvent", 0, "wxContextMenuEvent *", 0},{"_p_wxContextMenuEvent"},{0}}; -static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; -static swig_type_info _swigt__p_wxCloseEvent[] = {{"_p_wxCloseEvent", 0, "wxCloseEvent *", 0},{"_p_wxCloseEvent"},{0}}; -static swig_type_info _swigt__p_wxEraseEvent[] = {{"_p_wxEraseEvent", 0, "wxEraseEvent *", 0},{"_p_wxEraseEvent"},{0}}; -static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0},{"_p_wxMouseEvent"},{0}}; -static swig_type_info _swigt__p_wxPyApp[] = {{"_p_wxPyApp", 0, "wxPyApp *", 0},{"_p_wxPyApp"},{0}}; -static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{0}}; -static swig_type_info _swigt__p_wxPyCommandEvent[] = {{"_p_wxPyCommandEvent", 0, "wxPyCommandEvent *", 0},{"_p_wxPyCommandEvent"},{0}}; -static swig_type_info _swigt__p_wxDropTarget[] = {{"_p_wxDropTarget", 0, "wxDropTarget *", 0},{"_p_wxDropTarget"},{0}}; -static swig_type_info _swigt__p_wxChildFocusEvent[] = {{"_p_wxChildFocusEvent", 0, "wxChildFocusEvent *", 0},{"_p_wxChildFocusEvent"},{0}}; -static swig_type_info _swigt__p_wxFocusEvent[] = {{"_p_wxFocusEvent", 0, "wxFocusEvent *", 0},{"_p_wxFocusEvent"},{0}}; -static swig_type_info _swigt__p_wxDropFilesEvent[] = {{"_p_wxDropFilesEvent", 0, "wxDropFilesEvent *", 0},{"_p_wxDropFilesEvent"},{0}}; -static swig_type_info _swigt__p_wxControlWithItems[] = {{"_p_wxControlWithItems", 0, "wxControlWithItems *", 0},{"_p_wxControlWithItems"},{0}}; -static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; -static swig_type_info _swigt__p_wxValidator[] = {{"_p_wxValidator", 0, "wxValidator *", 0},{"_p_wxValidator"},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxValidator},{0}}; -static swig_type_info _swigt__p_wxPyValidator[] = {{"_p_wxPyValidator", 0, "wxPyValidator *", 0},{"_p_wxPyValidator"},{0}}; +static swig_type_info _swigt__p_wxLayoutConstraints[] = {{"_p_wxLayoutConstraints", 0, "wxLayoutConstraints *", 0, 0, 0, 0},{"_p_wxLayoutConstraints", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0, 0, 0, 0},{"_p_wxRealPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxSizerItem[] = {{"_p_wxSizerItem", 0, "wxSizerItem *", 0, 0, 0, 0},{"_p_wxSizerItem", 0, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGBSizerItem[] = {{"_p_wxGBSizerItem", 0, "wxGBSizerItem *", 0, 0, 0, 0},{"_p_wxGBSizerItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxScrollEvent[] = {{"_p_wxScrollEvent", 0, "wxScrollEvent *", 0, 0, 0, 0},{"_p_wxScrollEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxIndividualLayoutConstraint[] = {{"_p_wxIndividualLayoutConstraint", 0, "wxIndividualLayoutConstraint *", 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0, 0, 0, 0},{"_p_wxSizer", 0, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxBoxSizer[] = {{"_p_wxBoxSizer", 0, "wxBoxSizer *", 0, 0, 0, 0},{"_p_wxBoxSizer", 0, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxBoxSizer, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxStaticBoxSizer[] = {{"_p_wxStaticBoxSizer", 0, "wxStaticBoxSizer *", 0, 0, 0, 0},{"_p_wxStaticBoxSizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGridBagSizer[] = {{"_p_wxGridBagSizer", 0, "wxGridBagSizer *", 0, 0, 0, 0},{"_p_wxGridBagSizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxAcceleratorEntry[] = {{"_p_wxAcceleratorEntry", 0, "wxAcceleratorEntry *", 0, 0, 0, 0},{"_p_wxAcceleratorEntry", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxUpdateUIEvent[] = {{"_p_wxUpdateUIEvent", 0, "wxUpdateUIEvent *", 0, 0, 0, 0},{"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMenu[] = {{"_p_wxMenu", 0, "wxMenu *", 0, 0, 0, 0},{"_p_wxMenu", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEvent", 0, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGridSizer[] = {{"_p_wxGridSizer", 0, "wxGridSizer *", 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxGridSizer, 0, 0, 0, 0, 0},{"_p_wxGridSizer", 0, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxGridSizer, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFlexGridSizer[] = {{"_p_wxFlexGridSizer", 0, "wxFlexGridSizer *", 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxFlexGridSizer, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxInitDialogEvent[] = {{"_p_wxInitDialogEvent", 0, "wxInitDialogEvent *", 0, 0, 0, 0},{"_p_wxInitDialogEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxItemContainer[] = {{"_p_wxItemContainer", 0, "wxItemContainer *", 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxItemContainer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxNcPaintEvent[] = {{"_p_wxNcPaintEvent", 0, "wxNcPaintEvent *", 0, 0, 0, 0},{"_p_wxNcPaintEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPaintEvent[] = {{"_p_wxPaintEvent", 0, "wxPaintEvent *", 0, 0, 0, 0},{"_p_wxPaintEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxSysColourChangedEvent[] = {{"_p_wxSysColourChangedEvent", 0, "wxSysColourChangedEvent *", 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMouseCaptureChangedEvent[] = {{"_p_wxMouseCaptureChangedEvent", 0, "wxMouseCaptureChangedEvent *", 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDisplayChangedEvent[] = {{"_p_wxDisplayChangedEvent", 0, "wxDisplayChangedEvent *", 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPaletteChangedEvent[] = {{"_p_wxPaletteChangedEvent", 0, "wxPaletteChangedEvent *", 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *", 0, 0, 0, 0},{"_p_wxControl", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxControl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMenuBarBase[] = {{"_p_wxMenuBarBase", 0, "wxMenuBarBase *", 0, 0, 0, 0},{"_p_wxMenuBarBase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxSetCursorEvent[] = {{"_p_wxSetCursorEvent", 0, "wxSetCursorEvent *", 0, 0, 0, 0},{"_p_wxSetCursorEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFSFile[] = {{"_p_wxFSFile", 0, "wxFSFile *", 0, 0, 0, 0},{"_p_wxFSFile", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxCaret[] = {{"_p_wxCaret", 0, "wxCaret *", 0, 0, 0, 0},{"_p_wxCaret", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0, 0, 0, 0},{"_p_wxRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPoint2D[] = {{"_p_wxPoint2D", 0, "wxPoint2D *", 0, 0, 0, 0},{"_p_wxPoint2D", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPySizer[] = {{"_p_wxPySizer", 0, "wxPySizer *", 0, 0, 0, 0},{"_p_wxPySizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0, 0, 0, 0},{"_p_wxNotifyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyEvent[] = {{"_p_wxPyEvent", 0, "wxPyEvent *", 0, 0, 0, 0},{"_p_wxPyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPropagationDisabler[] = {{"_p_wxPropagationDisabler", 0, "wxPropagationDisabler *", 0, 0, 0, 0},{"_p_wxPropagationDisabler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxAppTraits[] = {{"_p_wxAppTraits", 0, "wxAppTraits *", 0, 0, 0, 0},{"_p_wxAppTraits", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxArrayString *", 0, 0, 0, 0},{"_p_wxArrayString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxShowEvent[] = {{"_p_wxShowEvent", 0, "wxShowEvent *", 0, 0, 0, 0},{"_p_wxShowEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxToolTip[] = {{"_p_wxToolTip", 0, "wxToolTip *", 0, 0, 0, 0},{"_p_wxToolTip", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0, 0, 0, 0},{"_p_wxMaximizeEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxIconizeEvent[] = {{"_p_wxIconizeEvent", 0, "wxIconizeEvent *", 0, 0, 0, 0},{"_p_wxIconizeEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxActivateEvent[] = {{"_p_wxActivateEvent", 0, "wxActivateEvent *", 0, 0, 0, 0},{"_p_wxActivateEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMoveEvent[] = {{"_p_wxMoveEvent", 0, "wxMoveEvent *", 0, 0, 0, 0},{"_p_wxMoveEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxSizeEvent[] = {{"_p_wxSizeEvent", 0, "wxSizeEvent *", 0, 0, 0, 0},{"_p_wxSizeEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxQueryNewPaletteEvent[] = {{"_p_wxQueryNewPaletteEvent", 0, "wxQueryNewPaletteEvent *", 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxWindowCreateEvent[] = {{"_p_wxWindowCreateEvent", 0, "wxWindowCreateEvent *", 0, 0, 0, 0},{"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxIdleEvent[] = {{"_p_wxIdleEvent", 0, "wxIdleEvent *", 0, 0, 0, 0},{"_p_wxIdleEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMenuItem[] = {{"_p_wxMenuItem", 0, "wxMenuItem *", 0, 0, 0, 0},{"_p_wxMenuItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxStaticBox[] = {{"_p_wxStaticBox", 0, "wxStaticBox *", 0, 0, 0, 0},{"_p_wxStaticBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_long[] = {{"_p_long", 0, "long *", 0, 0, 0, 0},{"_p_long", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxTIFFHandler[] = {{"_p_wxTIFFHandler", 0, "wxTIFFHandler *", 0, 0, 0, 0},{"_p_wxTIFFHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxXPMHandler[] = {{"_p_wxXPMHandler", 0, "wxXPMHandler *", 0, 0, 0, 0},{"_p_wxXPMHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPNMHandler[] = {{"_p_wxPNMHandler", 0, "wxPNMHandler *", 0, 0, 0, 0},{"_p_wxPNMHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxJPEGHandler[] = {{"_p_wxJPEGHandler", 0, "wxJPEGHandler *", 0, 0, 0, 0},{"_p_wxJPEGHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPCXHandler[] = {{"_p_wxPCXHandler", 0, "wxPCXHandler *", 0, 0, 0, 0},{"_p_wxPCXHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGIFHandler[] = {{"_p_wxGIFHandler", 0, "wxGIFHandler *", 0, 0, 0, 0},{"_p_wxGIFHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPNGHandler[] = {{"_p_wxPNGHandler", 0, "wxPNGHandler *", 0, 0, 0, 0},{"_p_wxPNGHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxANIHandler[] = {{"_p_wxANIHandler", 0, "wxANIHandler *", 0, 0, 0, 0},{"_p_wxANIHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMemoryFSHandler[] = {{"_p_wxMemoryFSHandler", 0, "wxMemoryFSHandler *", 0, 0, 0, 0},{"_p_wxMemoryFSHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxCURHandler[] = {{"_p_wxCURHandler", 0, "wxCURHandler *", 0, 0, 0, 0},{"_p_wxCURHandler", 0, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxCURHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxICOHandler[] = {{"_p_wxICOHandler", 0, "wxICOHandler *", 0, 0, 0, 0},{"_p_wxICOHandler", 0, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxICOHandler, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxICOHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxBMPHandler[] = {{"_p_wxBMPHandler", 0, "wxBMPHandler *", 0, 0, 0, 0},{"_p_wxBMPHandler", 0, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxBMPHandler, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxBMPHandler, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxBMPHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxImageHandler[] = {{"_p_wxImageHandler", 0, "wxImageHandler *", 0, 0, 0, 0},{"_p_wxImageHandler", 0, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxImageHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFileSystemHandler[] = {{"_p_wxFileSystemHandler", 0, "wxFileSystemHandler *", 0, 0, 0, 0},{"_p_wxFileSystemHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyFileSystemHandler", _p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler, 0, 0, 0, 0, 0},{"_p_wxInternetFSHandler", _p_wxInternetFSHandlerTo_p_wxFileSystemHandler, 0, 0, 0, 0, 0},{"_p_wxZipFSHandler", _p_wxZipFSHandlerTo_p_wxFileSystemHandler, 0, 0, 0, 0, 0},{"_p_wxMemoryFSHandler", _p_wxMemoryFSHandlerTo_p_wxFileSystemHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyFileSystemHandler[] = {{"_p_wxPyFileSystemHandler", 0, "wxPyFileSystemHandler *", 0, 0, 0, 0},{"_p_wxPyFileSystemHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxInternetFSHandler[] = {{"_p_wxInternetFSHandler", 0, "wxInternetFSHandler *", 0, 0, 0, 0},{"_p_wxInternetFSHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0, 0, 0, 0},{"_p_wxZipFSHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0, 0, 0, 0},{"_p_wxRect", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGBSpan[] = {{"_p_wxGBSpan", 0, "wxGBSpan *", 0, 0, 0, 0},{"_p_wxGBSpan", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPropagateOnce[] = {{"_p_wxPropagateOnce", 0, "wxPropagateOnce *", 0, 0, 0, 0},{"_p_wxPropagateOnce", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxAcceleratorTable[] = {{"_p_wxAcceleratorTable", 0, "wxAcceleratorTable *", 0, 0, 0, 0},{"_p_wxAcceleratorTable", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGBPosition[] = {{"_p_wxGBPosition", 0, "wxGBPosition *", 0, 0, 0, 0},{"_p_wxGBPosition", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0, 0, 0, 0},{"_p_wxImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0, 0, 0, 0},{"_p_wxFrame", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxScrollWinEvent[] = {{"_p_wxScrollWinEvent", 0, "wxScrollWinEvent *", 0, 0, 0, 0},{"_p_wxScrollWinEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxImageHistogram[] = {{"_p_wxImageHistogram", 0, "wxImageHistogram *", 0, 0, 0, 0},{"_p_wxImageHistogram", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{"_p_byte", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0, 0, 0, 0},{"_p_wxCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyInputStream[] = {{"_p_wxPyInputStream", 0, "wxPyInputStream *", 0, 0, 0, 0},{"_p_wxPyInputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0, 0, 0, 0},{"_p_wxOutputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxInputStream[] = {{"_p_wxInputStream", 0, "wxInputStream *", 0, 0, 0, 0},{"_p_wxInputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0, 0, 0, 0},{"_p_wxDateTime", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxKeyEvent[] = {{"_p_wxKeyEvent", 0, "wxKeyEvent *", 0, 0, 0, 0},{"_p_wxKeyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxNavigationKeyEvent[] = {{"_p_wxNavigationKeyEvent", 0, "wxNavigationKeyEvent *", 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxWindowDestroyEvent[] = {{"_p_wxWindowDestroyEvent", 0, "wxWindowDestroyEvent *", 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0, 0, 0, 0},{"_p_wxMenuBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFileSystem[] = {{"_p_wxFileSystem", 0, "wxFileSystem *", 0, 0, 0, 0},{"_p_wxFileSystem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMenuEvent[] = {{"_p_wxMenuEvent", 0, "wxMenuEvent *", 0, 0, 0, 0},{"_p_wxMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxContextMenuEvent[] = {{"_p_wxContextMenuEvent", 0, "wxContextMenuEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{"_p_byte", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxCloseEvent[] = {{"_p_wxCloseEvent", 0, "wxCloseEvent *", 0, 0, 0, 0},{"_p_wxCloseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEraseEvent[] = {{"_p_wxEraseEvent", 0, "wxEraseEvent *", 0, 0, 0, 0},{"_p_wxEraseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0, 0, 0, 0},{"_p_wxMouseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyApp[] = {{"_p_wxPyApp", 0, "wxPyApp *", 0, 0, 0, 0},{"_p_wxPyApp", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", 0, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyCommandEvent[] = {{"_p_wxPyCommandEvent", 0, "wxPyCommandEvent *", 0, 0, 0, 0},{"_p_wxPyCommandEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyDropTarget[] = {{"_p_wxPyDropTarget", 0, "wxPyDropTarget *", 0, 0, 0, 0},{"_p_wxPyDropTarget", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxChildFocusEvent[] = {{"_p_wxChildFocusEvent", 0, "wxChildFocusEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFocusEvent[] = {{"_p_wxFocusEvent", 0, "wxFocusEvent *", 0, 0, 0, 0},{"_p_wxFocusEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDropFilesEvent[] = {{"_p_wxDropFilesEvent", 0, "wxDropFilesEvent *", 0, 0, 0, 0},{"_p_wxDropFilesEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxControlWithItems[] = {{"_p_wxControlWithItems", 0, "wxControlWithItems *", 0, 0, 0, 0},{"_p_wxControlWithItems", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxValidator[] = {{"_p_wxValidator", 0, "wxValidator *", 0, 0, 0, 0},{"_p_wxValidator", 0, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxValidator, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyValidator[] = {{"_p_wxPyValidator", 0, "wxPyValidator *", 0, 0, 0, 0},{"_p_wxPyValidator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info *swig_types_initial[] = { _swigt__p_wxLayoutConstraints, @@ -37284,6 +41633,7 @@ _swigt__p_wxRect, _swigt__p_wxGBSpan, _swigt__p_wxPropagateOnce, _swigt__p_wxAcceleratorTable, +_swigt__p_char, _swigt__p_wxGBPosition, _swigt__p_wxImage, _swigt__p_wxFrame, @@ -37302,7 +41652,6 @@ _swigt__p_wxNavigationKeyEvent, _swigt__p_wxWindowDestroyEvent, _swigt__p_wxWindow, _swigt__p_wxMenuBar, -_swigt__p_wxString, _swigt__p_wxFileSystem, _swigt__p_wxBitmap, _swigt__p_wxMenuEvent, @@ -37314,7 +41663,7 @@ _swigt__p_wxMouseEvent, _swigt__p_wxPyApp, _swigt__p_wxCommandEvent, _swigt__p_wxPyCommandEvent, -_swigt__p_wxDropTarget, +_swigt__p_wxPyDropTarget, _swigt__p_wxChildFocusEvent, _swigt__p_wxFocusEvent, _swigt__p_wxDropFilesEvent, @@ -37329,774 +41678,6 @@ _swigt__p_wxPyValidator, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"NOT_FOUND", (long) wxNOT_FOUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VSCROLL", (long) wxVSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HSCROLL", (long) wxHSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAPTION", (long) wxCAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOUBLE_BORDER", (long) wxDOUBLE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SUNKEN_BORDER", (long) wxSUNKEN_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RAISED_BORDER", (long) wxRAISED_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER", (long) wxBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIMPLE_BORDER", (long) wxSIMPLE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STATIC_BORDER", (long) wxSTATIC_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TRANSPARENT_WINDOW", (long) wxTRANSPARENT_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_BORDER", (long) wxNO_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"USER_COLOURS", (long) wxUSER_COLOURS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_3D", (long) wxNO_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TAB_TRAVERSAL", (long) wxTAB_TRAVERSAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WANTS_CHARS", (long) wxWANTS_CHARS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"POPUP_WINDOW", (long) wxPOPUP_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER_FRAME", (long) wxCENTER_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTRE_ON_SCREEN", (long) wxCENTRE_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER_ON_SCREEN", (long) wxCENTER_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STAY_ON_TOP", (long) wxSTAY_ON_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICONIZE", (long) wxICONIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MINIMIZE", (long) wxMINIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAXIMIZE", (long) wxMAXIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLOSE_BOX", (long) wxCLOSE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"THICK_FRAME", (long) wxTHICK_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYSTEM_MENU", (long) wxSYSTEM_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MINIMIZE_BOX", (long) wxMINIMIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAXIMIZE_BOX", (long) wxMAXIMIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TINY_CAPTION_HORIZ", (long) wxTINY_CAPTION_HORIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TINY_CAPTION_VERT", (long) wxTINY_CAPTION_VERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESIZE_BOX", (long) wxRESIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESIZE_BORDER", (long) wxRESIZE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_MODAL", (long) wxDIALOG_MODAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_MODELESS", (long) wxDIALOG_MODELESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_NO_PARENT", (long) wxDIALOG_NO_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT_FRAME_STYLE", (long) wxDEFAULT_FRAME_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT_DIALOG_STYLE", (long) wxDEFAULT_DIALOG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_TOOL_WINDOW", (long) wxFRAME_TOOL_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_FLOAT_ON_PARENT", (long) wxFRAME_FLOAT_ON_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_NO_WINDOW_MENU", (long) wxFRAME_NO_WINDOW_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_NO_TASKBAR", (long) wxFRAME_NO_TASKBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_SHAPED", (long) wxFRAME_SHAPED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_CLIENT_MARGIN", (long) wxED_CLIENT_MARGIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_BUTTONS_BOTTOM", (long) wxED_BUTTONS_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_BUTTONS_RIGHT", (long) wxED_BUTTONS_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_STATIC_LINE", (long) wxED_STATIC_LINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXT_DIALOG_STYLE", (long) wxEXT_DIALOG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLIP_CHILDREN", (long) wxCLIP_CHILDREN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLIP_SIBLINGS", (long) wxCLIP_SIBLINGS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RETAINED", (long) wxRETAINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BACKINGSTORE", (long) wxBACKINGSTORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"COLOURED", (long) wxCOLOURED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIXED_LENGTH", (long) wxFIXED_LENGTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_NEEDED_SB", (long) wxLB_NEEDED_SB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_ALWAYS_SB", (long) wxLB_ALWAYS_SB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_SORT", (long) wxLB_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_SINGLE", (long) wxLB_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_MULTIPLE", (long) wxLB_MULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_EXTENDED", (long) wxLB_EXTENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_OWNERDRAW", (long) wxLB_OWNERDRAW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_HSCROLL", (long) wxLB_HSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PROCESS_ENTER", (long) wxPROCESS_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PASSWORD", (long) wxPASSWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_SIMPLE", (long) wxCB_SIMPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_DROPDOWN", (long) wxCB_DROPDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_SORT", (long) wxCB_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_READONLY", (long) wxCB_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_HORIZONTAL", (long) wxRA_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_VERTICAL", (long) wxRA_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_SPECIFY_ROWS", (long) wxRA_SPECIFY_ROWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_SPECIFY_COLS", (long) wxRA_SPECIFY_COLS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RB_GROUP", (long) wxRB_GROUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RB_SINGLE", (long) wxRB_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_HORIZONTAL", (long) wxSL_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_VERTICAL", (long) wxSL_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_AUTOTICKS", (long) wxSL_AUTOTICKS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_LABELS", (long) wxSL_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_LEFT", (long) wxSL_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_TOP", (long) wxSL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_RIGHT", (long) wxSL_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_BOTTOM", (long) wxSL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_BOTH", (long) wxSL_BOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_SELRANGE", (long) wxSL_SELRANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SB_HORIZONTAL", (long) wxSB_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SB_VERTICAL", (long) wxSB_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ST_SIZEGRIP", (long) wxST_SIZEGRIP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ST_NO_AUTORESIZE", (long) wxST_NO_AUTORESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLOOD_SURFACE", (long) wxFLOOD_SURFACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLOOD_BORDER", (long) wxFLOOD_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ODDEVEN_RULE", (long) wxODDEVEN_RULE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WINDING_RULE", (long) wxWINDING_RULE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_TOP", (long) wxTOOL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_BOTTOM", (long) wxTOOL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_LEFT", (long) wxTOOL_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_RIGHT", (long) wxTOOL_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OK", (long) wxOK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES_NO", (long) wxYES_NO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CANCEL", (long) wxCANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES", (long) wxYES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO", (long) wxNO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_DEFAULT", (long) wxNO_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES_DEFAULT", (long) wxYES_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_EXCLAMATION", (long) wxICON_EXCLAMATION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_HAND", (long) wxICON_HAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_QUESTION", (long) wxICON_QUESTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_INFORMATION", (long) wxICON_INFORMATION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_STOP", (long) wxICON_STOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_ASTERISK", (long) wxICON_ASTERISK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_MASK", (long) wxICON_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_WARNING", (long) wxICON_WARNING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_ERROR", (long) wxICON_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FORWARD", (long) wxFORWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BACKWARD", (long) wxBACKWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESET", (long) wxRESET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HELP", (long) wxHELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MORE", (long) wxMORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SETUP", (long) wxSETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO_WIDTH", (long) wxSIZE_AUTO_WIDTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO_HEIGHT", (long) wxSIZE_AUTO_HEIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO", (long) wxSIZE_AUTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_USE_EXISTING", (long) wxSIZE_USE_EXISTING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_ALLOW_MINUS_ONE", (long) wxSIZE_ALLOW_MINUS_ONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PORTRAIT", (long) wxPORTRAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANDSCAPE", (long) wxLANDSCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_HIGH", (long) wxPRINT_QUALITY_HIGH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_MEDIUM", (long) wxPRINT_QUALITY_MEDIUM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_LOW", (long) wxPRINT_QUALITY_LOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_DRAFT", (long) wxPRINT_QUALITY_DRAFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ANY", (long) wxID_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SEPARATOR", (long) wxID_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_LOWEST", (long) wxID_LOWEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_OPEN", (long) wxID_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLOSE", (long) wxID_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NEW", (long) wxID_NEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SAVE", (long) wxID_SAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SAVEAS", (long) wxID_SAVEAS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REVERT", (long) wxID_REVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_EXIT", (long) wxID_EXIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_UNDO", (long) wxID_UNDO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REDO", (long) wxID_REDO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP", (long) wxID_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PRINT", (long) wxID_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PRINT_SETUP", (long) wxID_PRINT_SETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW", (long) wxID_PREVIEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ABOUT", (long) wxID_ABOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_CONTENTS", (long) wxID_HELP_CONTENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_COMMANDS", (long) wxID_HELP_COMMANDS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_PROCEDURES", (long) wxID_HELP_PROCEDURES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_CONTEXT", (long) wxID_HELP_CONTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLOSE_ALL", (long) wxID_CLOSE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREFERENCES", (long) wxID_PREFERENCES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CUT", (long) wxID_CUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_COPY", (long) wxID_COPY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PASTE", (long) wxID_PASTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLEAR", (long) wxID_CLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FIND", (long) wxID_FIND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DUPLICATE", (long) wxID_DUPLICATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SELECTALL", (long) wxID_SELECTALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DELETE", (long) wxID_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REPLACE", (long) wxID_REPLACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REPLACE_ALL", (long) wxID_REPLACE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PROPERTIES", (long) wxID_PROPERTIES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_DETAILS", (long) wxID_VIEW_DETAILS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_LARGEICONS", (long) wxID_VIEW_LARGEICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SMALLICONS", (long) wxID_VIEW_SMALLICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_LIST", (long) wxID_VIEW_LIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTDATE", (long) wxID_VIEW_SORTDATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTNAME", (long) wxID_VIEW_SORTNAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTSIZE", (long) wxID_VIEW_SORTSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTTYPE", (long) wxID_VIEW_SORTTYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE1", (long) wxID_FILE1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE2", (long) wxID_FILE2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE3", (long) wxID_FILE3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE4", (long) wxID_FILE4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE5", (long) wxID_FILE5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE6", (long) wxID_FILE6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE7", (long) wxID_FILE7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE8", (long) wxID_FILE8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE9", (long) wxID_FILE9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_OK", (long) wxID_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CANCEL", (long) wxID_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_APPLY", (long) wxID_APPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_YES", (long) wxID_YES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NO", (long) wxID_NO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_STATIC", (long) wxID_STATIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FORWARD", (long) wxID_FORWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_BACKWARD", (long) wxID_BACKWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DEFAULT", (long) wxID_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_MORE", (long) wxID_MORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SETUP", (long) wxID_SETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_RESET", (long) wxID_RESET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CONTEXT_HELP", (long) wxID_CONTEXT_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_YESTOALL", (long) wxID_YESTOALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NOTOALL", (long) wxID_NOTOALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ABORT", (long) wxID_ABORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_RETRY", (long) wxID_RETRY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_IGNORE", (long) wxID_IGNORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HIGHEST", (long) wxID_HIGHEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OPEN", (long) wxOPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SAVE", (long) wxSAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HIDE_READONLY", (long) wxHIDE_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OVERWRITE_PROMPT", (long) wxOVERWRITE_PROMPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FILE_MUST_EXIST", (long) wxFILE_MUST_EXIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MULTIPLE", (long) wxMULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHANGE_DIR", (long) wxCHANGE_DIR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_ALT", (long) wxACCEL_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_CTRL", (long) wxACCEL_CTRL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_SHIFT", (long) wxACCEL_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_NORMAL", (long) wxACCEL_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_AUTO_HIDE", (long) wxPD_AUTO_HIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_APP_MODAL", (long) wxPD_APP_MODAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_CAN_ABORT", (long) wxPD_CAN_ABORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_ELAPSED_TIME", (long) wxPD_ELAPSED_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_ESTIMATED_TIME", (long) wxPD_ESTIMATED_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_REMAINING_TIME", (long) wxPD_REMAINING_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DD_NEW_DIR_BUTTON", (long) wxDD_NEW_DIR_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DD_DEFAULT_STYLE", (long) wxDD_DEFAULT_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MENU_TEAROFF", (long) wxMENU_TEAROFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MB_DOCKABLE", (long) wxMB_DOCKABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_FULL_REPAINT_ON_RESIZE", (long) wxNO_FULL_REPAINT_ON_RESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LI_HORIZONTAL", (long) wxLI_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LI_VERTICAL", (long) wxLI_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_VALIDATE_RECURSIVELY", (long) wxWS_EX_VALIDATE_RECURSIVELY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_BLOCK_EVENTS", (long) wxWS_EX_BLOCK_EVENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_TRANSIENT", (long) wxWS_EX_TRANSIENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_THEMED_BACKGROUND", (long) wxWS_EX_THEMED_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_PROCESS_IDLE", (long) wxWS_EX_PROCESS_IDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_PROCESS_UI_UPDATES", (long) wxWS_EX_PROCESS_UI_UPDATES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_TEXT", (long) wxMM_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_LOMETRIC", (long) wxMM_LOMETRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_HIMETRIC", (long) wxMM_HIMETRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_LOENGLISH", (long) wxMM_LOENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_HIENGLISH", (long) wxMM_HIENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_TWIPS", (long) wxMM_TWIPS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_ISOTROPIC", (long) wxMM_ISOTROPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_ANISOTROPIC", (long) wxMM_ANISOTROPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_POINTS", (long) wxMM_POINTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_METRIC", (long) wxMM_METRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTRE", (long) wxCENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER", (long) wxCENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HORIZONTAL", (long) wxHORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VERTICAL", (long) wxVERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOTH", (long) wxBOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LEFT", (long) wxLEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RIGHT", (long) wxRIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UP", (long) wxUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOWN", (long) wxDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOP", (long) wxTOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOTTOM", (long) wxBOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NORTH", (long) wxNORTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SOUTH", (long) wxSOUTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WEST", (long) wxWEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EAST", (long) wxEAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALL", (long) wxALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_NOT", (long) wxALIGN_NOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER_HORIZONTAL", (long) wxALIGN_CENTER_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE_HORIZONTAL", (long) wxALIGN_CENTRE_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_LEFT", (long) wxALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_TOP", (long) wxALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_RIGHT", (long) wxALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_BOTTOM", (long) wxALIGN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER_VERTICAL", (long) wxALIGN_CENTER_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE_VERTICAL", (long) wxALIGN_CENTRE_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER", (long) wxALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE", (long) wxALIGN_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_MASK", (long) wxALIGN_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STRETCH_NOT", (long) wxSTRETCH_NOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHRINK", (long) wxSHRINK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GROW", (long) wxGROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXPAND", (long) wxEXPAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHAPED", (long) wxSHAPED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ADJUST_MINSIZE", (long) wxADJUST_MINSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TILE", (long) wxTILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_DEFAULT", (long) wxBORDER_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_NONE", (long) wxBORDER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_STATIC", (long) wxBORDER_STATIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_SIMPLE", (long) wxBORDER_SIMPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_RAISED", (long) wxBORDER_RAISED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_SUNKEN", (long) wxBORDER_SUNKEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_DOUBLE", (long) wxBORDER_DOUBLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_MASK", (long) wxBORDER_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT", (long) wxDEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DECORATIVE", (long) wxDECORATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ROMAN", (long) wxROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SCRIPT", (long) wxSCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SWISS", (long) wxSWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MODERN", (long) wxMODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TELETYPE", (long) wxTELETYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VARIABLE", (long) wxVARIABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIXED", (long) wxFIXED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NORMAL", (long) wxNORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIGHT", (long) wxLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOLD", (long) wxBOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITALIC", (long) wxITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SLANT", (long) wxSLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SOLID", (long) wxSOLID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOT", (long) wxDOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LONG_DASH", (long) wxLONG_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHORT_DASH", (long) wxSHORT_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOT_DASH", (long) wxDOT_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"USER_DASH", (long) wxUSER_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TRANSPARENT", (long) wxTRANSPARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STIPPLE", (long) wxSTIPPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BDIAGONAL_HATCH", (long) wxBDIAGONAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CROSSDIAG_HATCH", (long) wxCROSSDIAG_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FDIAGONAL_HATCH", (long) wxFDIAGONAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CROSS_HATCH", (long) wxCROSS_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HORIZONTAL_HATCH", (long) wxHORIZONTAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VERTICAL_HATCH", (long) wxVERTICAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_BEVEL", (long) wxJOIN_BEVEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_MITER", (long) wxJOIN_MITER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_ROUND", (long) wxJOIN_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_ROUND", (long) wxCAP_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_PROJECTING", (long) wxCAP_PROJECTING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_BUTT", (long) wxCAP_BUTT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLEAR", (long) wxCLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"XOR", (long) wxXOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"INVERT", (long) wxINVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR_REVERSE", (long) wxOR_REVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND_REVERSE", (long) wxAND_REVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"COPY", (long) wxCOPY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND", (long) wxAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND_INVERT", (long) wxAND_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_OP", (long) wxNO_OP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NOR", (long) wxNOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EQUIV", (long) wxEQUIV, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SRC_INVERT", (long) wxSRC_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR_INVERT", (long) wxOR_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NAND", (long) wxNAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR", (long) wxOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SET", (long) wxSET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_BACK", (long) WXK_BACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_TAB", (long) WXK_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RETURN", (long) WXK_RETURN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ESCAPE", (long) WXK_ESCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SPACE", (long) WXK_SPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DELETE", (long) WXK_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_START", (long) WXK_START, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_LBUTTON", (long) WXK_LBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RBUTTON", (long) WXK_RBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CANCEL", (long) WXK_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MBUTTON", (long) WXK_MBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CLEAR", (long) WXK_CLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SHIFT", (long) WXK_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ALT", (long) WXK_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CONTROL", (long) WXK_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MENU", (long) WXK_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAUSE", (long) WXK_PAUSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CAPITAL", (long) WXK_CAPITAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PRIOR", (long) WXK_PRIOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NEXT", (long) WXK_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_END", (long) WXK_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_HOME", (long) WXK_HOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_LEFT", (long) WXK_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_UP", (long) WXK_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RIGHT", (long) WXK_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DOWN", (long) WXK_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SELECT", (long) WXK_SELECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PRINT", (long) WXK_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_EXECUTE", (long) WXK_EXECUTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SNAPSHOT", (long) WXK_SNAPSHOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_INSERT", (long) WXK_INSERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_HELP", (long) WXK_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD0", (long) WXK_NUMPAD0, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD1", (long) WXK_NUMPAD1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD2", (long) WXK_NUMPAD2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD3", (long) WXK_NUMPAD3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD4", (long) WXK_NUMPAD4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD5", (long) WXK_NUMPAD5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD6", (long) WXK_NUMPAD6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD7", (long) WXK_NUMPAD7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD8", (long) WXK_NUMPAD8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD9", (long) WXK_NUMPAD9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MULTIPLY", (long) WXK_MULTIPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ADD", (long) WXK_ADD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SEPARATOR", (long) WXK_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SUBTRACT", (long) WXK_SUBTRACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DECIMAL", (long) WXK_DECIMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DIVIDE", (long) WXK_DIVIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F1", (long) WXK_F1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F2", (long) WXK_F2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F3", (long) WXK_F3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F4", (long) WXK_F4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F5", (long) WXK_F5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F6", (long) WXK_F6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F7", (long) WXK_F7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F8", (long) WXK_F8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F9", (long) WXK_F9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F10", (long) WXK_F10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F11", (long) WXK_F11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F12", (long) WXK_F12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F13", (long) WXK_F13, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F14", (long) WXK_F14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F15", (long) WXK_F15, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F16", (long) WXK_F16, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F17", (long) WXK_F17, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F18", (long) WXK_F18, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F19", (long) WXK_F19, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F20", (long) WXK_F20, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F21", (long) WXK_F21, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F22", (long) WXK_F22, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F23", (long) WXK_F23, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F24", (long) WXK_F24, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMLOCK", (long) WXK_NUMLOCK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SCROLL", (long) WXK_SCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAGEUP", (long) WXK_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAGEDOWN", (long) WXK_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SPACE", (long) WXK_NUMPAD_SPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_TAB", (long) WXK_NUMPAD_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_ENTER", (long) WXK_NUMPAD_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F1", (long) WXK_NUMPAD_F1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F2", (long) WXK_NUMPAD_F2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F3", (long) WXK_NUMPAD_F3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F4", (long) WXK_NUMPAD_F4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_HOME", (long) WXK_NUMPAD_HOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_LEFT", (long) WXK_NUMPAD_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_UP", (long) WXK_NUMPAD_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_RIGHT", (long) WXK_NUMPAD_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DOWN", (long) WXK_NUMPAD_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PRIOR", (long) WXK_NUMPAD_PRIOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PAGEUP", (long) WXK_NUMPAD_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_NEXT", (long) WXK_NUMPAD_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PAGEDOWN", (long) WXK_NUMPAD_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_END", (long) WXK_NUMPAD_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_BEGIN", (long) WXK_NUMPAD_BEGIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_INSERT", (long) WXK_NUMPAD_INSERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DELETE", (long) WXK_NUMPAD_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_EQUAL", (long) WXK_NUMPAD_EQUAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_MULTIPLY", (long) WXK_NUMPAD_MULTIPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_ADD", (long) WXK_NUMPAD_ADD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SEPARATOR", (long) WXK_NUMPAD_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SUBTRACT", (long) WXK_NUMPAD_SUBTRACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DECIMAL", (long) WXK_NUMPAD_DECIMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DIVIDE", (long) WXK_NUMPAD_DIVIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_LEFT", (long) WXK_WINDOWS_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_RIGHT", (long) WXK_WINDOWS_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_MENU", (long) WXK_WINDOWS_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_NONE", (long) wxPAPER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER", (long) wxPAPER_LETTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEGAL", (long) wxPAPER_LEGAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4", (long) wxPAPER_A4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_CSHEET", (long) wxPAPER_CSHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_DSHEET", (long) wxPAPER_DSHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ESHEET", (long) wxPAPER_ESHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTERSMALL", (long) wxPAPER_LETTERSMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_TABLOID", (long) wxPAPER_TABLOID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEDGER", (long) wxPAPER_LEDGER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_STATEMENT", (long) wxPAPER_STATEMENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_EXECUTIVE", (long) wxPAPER_EXECUTIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3", (long) wxPAPER_A3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4SMALL", (long) wxPAPER_A4SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5", (long) wxPAPER_A5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B4", (long) wxPAPER_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5", (long) wxPAPER_B5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FOLIO", (long) wxPAPER_FOLIO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_QUARTO", (long) wxPAPER_QUARTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_10X14", (long) wxPAPER_10X14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_11X17", (long) wxPAPER_11X17, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_NOTE", (long) wxPAPER_NOTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_9", (long) wxPAPER_ENV_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_10", (long) wxPAPER_ENV_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_11", (long) wxPAPER_ENV_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_12", (long) wxPAPER_ENV_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_14", (long) wxPAPER_ENV_14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_DL", (long) wxPAPER_ENV_DL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C5", (long) wxPAPER_ENV_C5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C3", (long) wxPAPER_ENV_C3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C4", (long) wxPAPER_ENV_C4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C6", (long) wxPAPER_ENV_C6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C65", (long) wxPAPER_ENV_C65, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B4", (long) wxPAPER_ENV_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B5", (long) wxPAPER_ENV_B5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B6", (long) wxPAPER_ENV_B6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_ITALY", (long) wxPAPER_ENV_ITALY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_MONARCH", (long) wxPAPER_ENV_MONARCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_PERSONAL", (long) wxPAPER_ENV_PERSONAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_US", (long) wxPAPER_FANFOLD_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_STD_GERMAN", (long) wxPAPER_FANFOLD_STD_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_LGL_GERMAN", (long) wxPAPER_FANFOLD_LGL_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ISO_B4", (long) wxPAPER_ISO_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_JAPANESE_POSTCARD", (long) wxPAPER_JAPANESE_POSTCARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_9X11", (long) wxPAPER_9X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_10X11", (long) wxPAPER_10X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_15X11", (long) wxPAPER_15X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_INVITE", (long) wxPAPER_ENV_INVITE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_EXTRA", (long) wxPAPER_LETTER_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEGAL_EXTRA", (long) wxPAPER_LEGAL_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_TABLOID_EXTRA", (long) wxPAPER_TABLOID_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_EXTRA", (long) wxPAPER_A4_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_TRANSVERSE", (long) wxPAPER_LETTER_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_TRANSVERSE", (long) wxPAPER_A4_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_EXTRA_TRANSVERSE", (long) wxPAPER_LETTER_EXTRA_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A_PLUS", (long) wxPAPER_A_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B_PLUS", (long) wxPAPER_B_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_PLUS", (long) wxPAPER_LETTER_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_PLUS", (long) wxPAPER_A4_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5_TRANSVERSE", (long) wxPAPER_A5_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5_TRANSVERSE", (long) wxPAPER_B5_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_EXTRA", (long) wxPAPER_A3_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5_EXTRA", (long) wxPAPER_A5_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5_EXTRA", (long) wxPAPER_B5_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A2", (long) wxPAPER_A2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_TRANSVERSE", (long) wxPAPER_A3_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_EXTRA_TRANSVERSE", (long) wxPAPER_A3_EXTRA_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_SIMPLEX", (long) wxDUPLEX_SIMPLEX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_HORIZONTAL", (long) wxDUPLEX_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_VERTICAL", (long) wxDUPLEX_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_SEPARATOR", (long) wxITEM_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_NORMAL", (long) wxITEM_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_CHECK", (long) wxITEM_CHECK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_RADIO", (long) wxITEM_RADIO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_MAX", (long) wxITEM_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_NOWHERE", (long) wxHT_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_FIRST", (long) wxHT_SCROLLBAR_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_LINE_1", (long) wxHT_SCROLLBAR_ARROW_LINE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_LINE_2", (long) wxHT_SCROLLBAR_ARROW_LINE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_PAGE_1", (long) wxHT_SCROLLBAR_ARROW_PAGE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_PAGE_2", (long) wxHT_SCROLLBAR_ARROW_PAGE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_THUMB", (long) wxHT_SCROLLBAR_THUMB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_BAR_1", (long) wxHT_SCROLLBAR_BAR_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_BAR_2", (long) wxHT_SCROLLBAR_BAR_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_LAST", (long) wxHT_SCROLLBAR_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_OUTSIDE", (long) wxHT_WINDOW_OUTSIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_INSIDE", (long) wxHT_WINDOW_INSIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_VERT_SCROLLBAR", (long) wxHT_WINDOW_VERT_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_HORZ_SCROLLBAR", (long) wxHT_WINDOW_HORZ_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_CORNER", (long) wxHT_WINDOW_CORNER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_MAX", (long) wxHT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_NONE", (long) wxMOD_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_ALT", (long) wxMOD_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_CONTROL", (long) wxMOD_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_SHIFT", (long) wxMOD_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_WIN", (long) wxMOD_WIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_NONE", (long) wxUPDATE_UI_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_RECURSE", (long) wxUPDATE_UI_RECURSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP_RESOURCE", (long) wxBITMAP_TYPE_BMP_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_RESOURCE", (long) wxBITMAP_TYPE_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO_RESOURCE", (long) wxBITMAP_TYPE_ICO_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR_RESOURCE", (long) wxBITMAP_TYPE_CUR_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF_RESOURCE", (long) wxBITMAP_TYPE_TIF_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF_RESOURCE", (long) wxBITMAP_TYPE_GIF_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG_RESOURCE", (long) wxBITMAP_TYPE_PNG_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG_RESOURCE", (long) wxBITMAP_TYPE_JPEG_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM_RESOURCE", (long) wxBITMAP_TYPE_PNM_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX_RESOURCE", (long) wxBITMAP_TYPE_PCX_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT_RESOURCE", (long) wxBITMAP_TYPE_PICT_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON_RESOURCE", (long) wxBITMAP_TYPE_ICON_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR_RESOURCE", (long) wxBITMAP_TYPE_MACCURSOR_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_RIGHT_ARROW", (long) wxCURSOR_RIGHT_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_BULLSEYE", (long) wxCURSOR_BULLSEYE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_CHAR", (long) wxCURSOR_CHAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_CROSS", (long) wxCURSOR_CROSS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_HAND", (long) wxCURSOR_HAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_IBEAM", (long) wxCURSOR_IBEAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_LEFT_BUTTON", (long) wxCURSOR_LEFT_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MAGNIFIER", (long) wxCURSOR_MAGNIFIER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MIDDLE_BUTTON", (long) wxCURSOR_MIDDLE_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_NO_ENTRY", (long) wxCURSOR_NO_ENTRY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_PAINT_BRUSH", (long) wxCURSOR_PAINT_BRUSH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_PENCIL", (long) wxCURSOR_PENCIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_POINT_LEFT", (long) wxCURSOR_POINT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_POINT_RIGHT", (long) wxCURSOR_POINT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_QUESTION_ARROW", (long) wxCURSOR_QUESTION_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_RIGHT_BUTTON", (long) wxCURSOR_RIGHT_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENESW", (long) wxCURSOR_SIZENESW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENS", (long) wxCURSOR_SIZENS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENWSE", (long) wxCURSOR_SIZENWSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZEWE", (long) wxCURSOR_SIZEWE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZING", (long) wxCURSOR_SIZING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SPRAYCAN", (long) wxCURSOR_SPRAYCAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_WAIT", (long) wxCURSOR_WAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_WATCH", (long) wxCURSOR_WATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_BLANK", (long) wxCURSOR_BLANK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_DEFAULT", (long) wxCURSOR_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_COPY_ARROW", (long) wxCURSOR_COPY_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_ARROWWAIT", (long) wxCURSOR_ARROWWAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MAX", (long) wxCURSOR_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromStart", (long) wxFromStart, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromCurrent", (long) wxFromCurrent, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromEnd", (long) wxFromEnd, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_RESOLUTION_INCHES", (long) wxIMAGE_RESOLUTION_INCHES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_RESOLUTION_CM", (long) wxIMAGE_RESOLUTION_CM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_24BPP", (long) wxBMP_24BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP", (long) wxBMP_8BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_GREY", (long) wxBMP_8BPP_GREY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_GRAY", (long) wxBMP_8BPP_GRAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_RED", (long) wxBMP_8BPP_RED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_PALETTE", (long) wxBMP_8BPP_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_4BPP", (long) wxBMP_4BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_1BPP", (long) wxBMP_1BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_1BPP_BW", (long) wxBMP_1BPP_BW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EVENT_PROPAGATE_NONE", (long) wxEVENT_PROPAGATE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EVENT_PROPAGATE_MAX", (long) wxEVENT_PROPAGATE_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NULL", (long) wxEVT_NULL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_FIRST", (long) wxEVT_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_USER_FIRST", (long) wxEVT_USER_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_BUTTON_CLICKED", (long) wxEVT_COMMAND_BUTTON_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHECKBOX_CLICKED", (long) wxEVT_COMMAND_CHECKBOX_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHOICE_SELECTED", (long) wxEVT_COMMAND_CHOICE_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOX_SELECTED", (long) wxEVT_COMMAND_LISTBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOX_DOUBLECLICKED", (long) wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHECKLISTBOX_TOGGLED", (long) wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MENU_SELECTED", (long) wxEVT_COMMAND_MENU_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_CLICKED", (long) wxEVT_COMMAND_TOOL_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SLIDER_UPDATED", (long) wxEVT_COMMAND_SLIDER_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RADIOBOX_SELECTED", (long) wxEVT_COMMAND_RADIOBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RADIOBUTTON_SELECTED", (long) wxEVT_COMMAND_RADIOBUTTON_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SCROLLBAR_UPDATED", (long) wxEVT_COMMAND_SCROLLBAR_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_VLBOX_SELECTED", (long) wxEVT_COMMAND_VLBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_COMBOBOX_SELECTED", (long) wxEVT_COMMAND_COMBOBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_RCLICKED", (long) wxEVT_COMMAND_TOOL_RCLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_ENTER", (long) wxEVT_COMMAND_TOOL_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_DOWN", (long) wxEVT_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_UP", (long) wxEVT_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_DOWN", (long) wxEVT_MIDDLE_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_UP", (long) wxEVT_MIDDLE_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_DOWN", (long) wxEVT_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_UP", (long) wxEVT_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOTION", (long) wxEVT_MOTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ENTER_WINDOW", (long) wxEVT_ENTER_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEAVE_WINDOW", (long) wxEVT_LEAVE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_DCLICK", (long) wxEVT_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_DCLICK", (long) wxEVT_MIDDLE_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_DCLICK", (long) wxEVT_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SET_FOCUS", (long) wxEVT_SET_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KILL_FOCUS", (long) wxEVT_KILL_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHILD_FOCUS", (long) wxEVT_CHILD_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOUSEWHEEL", (long) wxEVT_MOUSEWHEEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_DOWN", (long) wxEVT_NC_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_UP", (long) wxEVT_NC_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_DOWN", (long) wxEVT_NC_MIDDLE_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_UP", (long) wxEVT_NC_MIDDLE_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_DOWN", (long) wxEVT_NC_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_UP", (long) wxEVT_NC_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MOTION", (long) wxEVT_NC_MOTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_ENTER_WINDOW", (long) wxEVT_NC_ENTER_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEAVE_WINDOW", (long) wxEVT_NC_LEAVE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_DCLICK", (long) wxEVT_NC_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_DCLICK", (long) wxEVT_NC_MIDDLE_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_DCLICK", (long) wxEVT_NC_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHAR", (long) wxEVT_CHAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHAR_HOOK", (long) wxEVT_CHAR_HOOK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NAVIGATION_KEY", (long) wxEVT_NAVIGATION_KEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KEY_DOWN", (long) wxEVT_KEY_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KEY_UP", (long) wxEVT_KEY_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_HOTKEY", (long) wxEVT_HOTKEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SET_CURSOR", (long) wxEVT_SET_CURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_TOP", (long) wxEVT_SCROLL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_BOTTOM", (long) wxEVT_SCROLL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_LINEUP", (long) wxEVT_SCROLL_LINEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_LINEDOWN", (long) wxEVT_SCROLL_LINEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_PAGEUP", (long) wxEVT_SCROLL_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_PAGEDOWN", (long) wxEVT_SCROLL_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_THUMBTRACK", (long) wxEVT_SCROLL_THUMBTRACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_THUMBRELEASE", (long) wxEVT_SCROLL_THUMBRELEASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_ENDSCROLL", (long) wxEVT_SCROLL_ENDSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_TOP", (long) wxEVT_SCROLLWIN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_BOTTOM", (long) wxEVT_SCROLLWIN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_LINEUP", (long) wxEVT_SCROLLWIN_LINEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_LINEDOWN", (long) wxEVT_SCROLLWIN_LINEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_PAGEUP", (long) wxEVT_SCROLLWIN_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_PAGEDOWN", (long) wxEVT_SCROLLWIN_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_THUMBTRACK", (long) wxEVT_SCROLLWIN_THUMBTRACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_THUMBRELEASE", (long) wxEVT_SCROLLWIN_THUMBRELEASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SIZE", (long) wxEVT_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOVE", (long) wxEVT_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CLOSE_WINDOW", (long) wxEVT_CLOSE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_END_SESSION", (long) wxEVT_END_SESSION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_END_SESSION", (long) wxEVT_QUERY_END_SESSION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ACTIVATE_APP", (long) wxEVT_ACTIVATE_APP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_POWER", (long) wxEVT_POWER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ACTIVATE", (long) wxEVT_ACTIVATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CREATE", (long) wxEVT_CREATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DESTROY", (long) wxEVT_DESTROY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SHOW", (long) wxEVT_SHOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ICONIZE", (long) wxEVT_ICONIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MAXIMIZE", (long) wxEVT_MAXIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOUSE_CAPTURE_CHANGED", (long) wxEVT_MOUSE_CAPTURE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PAINT", (long) wxEVT_PAINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ERASE_BACKGROUND", (long) wxEVT_ERASE_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_PAINT", (long) wxEVT_NC_PAINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PAINT_ICON", (long) wxEVT_PAINT_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_OPEN", (long) wxEVT_MENU_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_CLOSE", (long) wxEVT_MENU_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_HIGHLIGHT", (long) wxEVT_MENU_HIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CONTEXT_MENU", (long) wxEVT_CONTEXT_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SYS_COLOUR_CHANGED", (long) wxEVT_SYS_COLOUR_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DISPLAY_CHANGED", (long) wxEVT_DISPLAY_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SETTING_CHANGED", (long) wxEVT_SETTING_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_NEW_PALETTE", (long) wxEVT_QUERY_NEW_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PALETTE_CHANGED", (long) wxEVT_PALETTE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DROP_FILES", (long) wxEVT_DROP_FILES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DRAW_ITEM", (long) wxEVT_DRAW_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MEASURE_ITEM", (long) wxEVT_MEASURE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMPARE_ITEM", (long) wxEVT_COMPARE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_INIT_DIALOG", (long) wxEVT_INIT_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_IDLE", (long) wxEVT_IDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_UPDATE_UI", (long) wxEVT_UPDATE_UI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SIZING", (long) wxEVT_SIZING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOVING", (long) wxEVT_MOVING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LEFT_CLICK", (long) wxEVT_COMMAND_LEFT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LEFT_DCLICK", (long) wxEVT_COMMAND_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RIGHT_CLICK", (long) wxEVT_COMMAND_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RIGHT_DCLICK", (long) wxEVT_COMMAND_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SET_FOCUS", (long) wxEVT_COMMAND_SET_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_KILL_FOCUS", (long) wxEVT_COMMAND_KILL_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_ENTER", (long) wxEVT_COMMAND_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_ANY", (long) wxMOUSE_BTN_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_NONE", (long) wxMOUSE_BTN_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_LEFT", (long) wxMOUSE_BTN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_MIDDLE", (long) wxMOUSE_BTN_MIDDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_RIGHT", (long) wxMOUSE_BTN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_PROCESS_ALL", (long) wxUPDATE_UI_PROCESS_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_PROCESS_SPECIFIED", (long) wxUPDATE_UI_PROCESS_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDLE_PROCESS_ALL", (long) wxIDLE_PROCESS_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDLE_PROCESS_SPECIFIED", (long) wxIDLE_PROCESS_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_SUPPRESS", (long) wxPYAPP_ASSERT_SUPPRESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_EXCEPTION", (long) wxPYAPP_ASSERT_EXCEPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_DIALOG", (long) wxPYAPP_ASSERT_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_LOG", (long) wxPYAPP_ASSERT_LOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_WINDOWS", (long) wxPRINT_WINDOWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_POSTSCRIPT", (long) wxPRINT_POSTSCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_NONE", (long) wxFLEX_GROWMODE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_SPECIFIED", (long) wxFLEX_GROWMODE_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_ALL", (long) wxFLEX_GROWMODE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Left", (long) wxLeft, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Top", (long) wxTop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Right", (long) wxRight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Bottom", (long) wxBottom, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Width", (long) wxWidth, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Height", (long) wxHeight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Centre", (long) wxCentre, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Center", (long) wxCenter, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CentreX", (long) wxCentreX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CentreY", (long) wxCentreY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Unconstrained", (long) wxUnconstrained, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AsIs", (long) wxAsIs, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PercentOf", (long) wxPercentOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Above", (long) wxAbove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Below", (long) wxBelow, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LeftOf", (long) wxLeftOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RightOf", (long) wxRightOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SameAs", (long) wxSameAs, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Absolute", (long) wxAbsolute, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -38132,9 +41713,602 @@ SWIGEXPORT(void) SWIG_init(void) { Py_XDECREF(cobj); #endif + PyDict_SetItemString(d,"NOT_FOUND", SWIG_FromInt((int)wxNOT_FOUND)); + PyDict_SetItemString(d,"VSCROLL", SWIG_FromInt((int)wxVSCROLL)); + PyDict_SetItemString(d,"HSCROLL", SWIG_FromInt((int)wxHSCROLL)); + PyDict_SetItemString(d,"CAPTION", SWIG_FromInt((int)wxCAPTION)); + PyDict_SetItemString(d,"DOUBLE_BORDER", SWIG_FromInt((int)wxDOUBLE_BORDER)); + PyDict_SetItemString(d,"SUNKEN_BORDER", SWIG_FromInt((int)wxSUNKEN_BORDER)); + PyDict_SetItemString(d,"RAISED_BORDER", SWIG_FromInt((int)wxRAISED_BORDER)); + PyDict_SetItemString(d,"BORDER", SWIG_FromInt((int)wxBORDER)); + PyDict_SetItemString(d,"SIMPLE_BORDER", SWIG_FromInt((int)wxSIMPLE_BORDER)); + PyDict_SetItemString(d,"STATIC_BORDER", SWIG_FromInt((int)wxSTATIC_BORDER)); + PyDict_SetItemString(d,"TRANSPARENT_WINDOW", SWIG_FromInt((int)wxTRANSPARENT_WINDOW)); + PyDict_SetItemString(d,"NO_BORDER", SWIG_FromInt((int)wxNO_BORDER)); + PyDict_SetItemString(d,"USER_COLOURS", SWIG_FromInt((int)wxUSER_COLOURS)); + PyDict_SetItemString(d,"NO_3D", SWIG_FromInt((int)wxNO_3D)); + PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_FromInt((int)wxTAB_TRAVERSAL)); + PyDict_SetItemString(d,"WANTS_CHARS", SWIG_FromInt((int)wxWANTS_CHARS)); + PyDict_SetItemString(d,"POPUP_WINDOW", SWIG_FromInt((int)wxPOPUP_WINDOW)); + PyDict_SetItemString(d,"CENTER_FRAME", SWIG_FromInt((int)wxCENTER_FRAME)); + PyDict_SetItemString(d,"CENTRE_ON_SCREEN", SWIG_FromInt((int)wxCENTRE_ON_SCREEN)); + PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_FromInt((int)wxCENTER_ON_SCREEN)); + PyDict_SetItemString(d,"STAY_ON_TOP", SWIG_FromInt((int)wxSTAY_ON_TOP)); + PyDict_SetItemString(d,"ICONIZE", SWIG_FromInt((int)wxICONIZE)); + PyDict_SetItemString(d,"MINIMIZE", SWIG_FromInt((int)wxMINIMIZE)); + PyDict_SetItemString(d,"MAXIMIZE", SWIG_FromInt((int)wxMAXIMIZE)); + PyDict_SetItemString(d,"CLOSE_BOX", SWIG_FromInt((int)wxCLOSE_BOX)); + PyDict_SetItemString(d,"THICK_FRAME", SWIG_FromInt((int)wxTHICK_FRAME)); + PyDict_SetItemString(d,"SYSTEM_MENU", SWIG_FromInt((int)wxSYSTEM_MENU)); + PyDict_SetItemString(d,"MINIMIZE_BOX", SWIG_FromInt((int)wxMINIMIZE_BOX)); + PyDict_SetItemString(d,"MAXIMIZE_BOX", SWIG_FromInt((int)wxMAXIMIZE_BOX)); + PyDict_SetItemString(d,"TINY_CAPTION_HORIZ", SWIG_FromInt((int)wxTINY_CAPTION_HORIZ)); + PyDict_SetItemString(d,"TINY_CAPTION_VERT", SWIG_FromInt((int)wxTINY_CAPTION_VERT)); + PyDict_SetItemString(d,"RESIZE_BOX", SWIG_FromInt((int)wxRESIZE_BOX)); + PyDict_SetItemString(d,"RESIZE_BORDER", SWIG_FromInt((int)wxRESIZE_BORDER)); + PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_FromInt((int)wxDIALOG_MODAL)); + PyDict_SetItemString(d,"DIALOG_MODELESS", SWIG_FromInt((int)wxDIALOG_MODELESS)); + PyDict_SetItemString(d,"DIALOG_NO_PARENT", SWIG_FromInt((int)wxDIALOG_NO_PARENT)); + PyDict_SetItemString(d,"DEFAULT_FRAME_STYLE", SWIG_FromInt((int)wxDEFAULT_FRAME_STYLE)); + PyDict_SetItemString(d,"DEFAULT_DIALOG_STYLE", SWIG_FromInt((int)wxDEFAULT_DIALOG_STYLE)); + PyDict_SetItemString(d,"FRAME_TOOL_WINDOW", SWIG_FromInt((int)wxFRAME_TOOL_WINDOW)); + PyDict_SetItemString(d,"FRAME_FLOAT_ON_PARENT", SWIG_FromInt((int)wxFRAME_FLOAT_ON_PARENT)); + PyDict_SetItemString(d,"FRAME_NO_WINDOW_MENU", SWIG_FromInt((int)wxFRAME_NO_WINDOW_MENU)); + PyDict_SetItemString(d,"FRAME_NO_TASKBAR", SWIG_FromInt((int)wxFRAME_NO_TASKBAR)); + PyDict_SetItemString(d,"FRAME_SHAPED", SWIG_FromInt((int)wxFRAME_SHAPED)); + PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_FromInt((int)wxED_CLIENT_MARGIN)); + PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_FromInt((int)wxED_BUTTONS_BOTTOM)); + PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_FromInt((int)wxED_BUTTONS_RIGHT)); + PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_FromInt((int)wxED_STATIC_LINE)); + PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_FromInt((int)wxEXT_DIALOG_STYLE)); + PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_FromInt((int)wxCLIP_CHILDREN)); + PyDict_SetItemString(d,"CLIP_SIBLINGS", SWIG_FromInt((int)wxCLIP_SIBLINGS)); + PyDict_SetItemString(d,"RETAINED", SWIG_FromInt((int)wxRETAINED)); + PyDict_SetItemString(d,"BACKINGSTORE", SWIG_FromInt((int)wxBACKINGSTORE)); + PyDict_SetItemString(d,"COLOURED", SWIG_FromInt((int)wxCOLOURED)); + PyDict_SetItemString(d,"FIXED_LENGTH", SWIG_FromInt((int)wxFIXED_LENGTH)); + PyDict_SetItemString(d,"LB_NEEDED_SB", SWIG_FromInt((int)wxLB_NEEDED_SB)); + PyDict_SetItemString(d,"LB_ALWAYS_SB", SWIG_FromInt((int)wxLB_ALWAYS_SB)); + PyDict_SetItemString(d,"LB_SORT", SWIG_FromInt((int)wxLB_SORT)); + PyDict_SetItemString(d,"LB_SINGLE", SWIG_FromInt((int)wxLB_SINGLE)); + PyDict_SetItemString(d,"LB_MULTIPLE", SWIG_FromInt((int)wxLB_MULTIPLE)); + PyDict_SetItemString(d,"LB_EXTENDED", SWIG_FromInt((int)wxLB_EXTENDED)); + PyDict_SetItemString(d,"LB_OWNERDRAW", SWIG_FromInt((int)wxLB_OWNERDRAW)); + PyDict_SetItemString(d,"LB_HSCROLL", SWIG_FromInt((int)wxLB_HSCROLL)); + PyDict_SetItemString(d,"PROCESS_ENTER", SWIG_FromInt((int)wxPROCESS_ENTER)); + PyDict_SetItemString(d,"PASSWORD", SWIG_FromInt((int)wxPASSWORD)); + PyDict_SetItemString(d,"CB_SIMPLE", SWIG_FromInt((int)wxCB_SIMPLE)); + PyDict_SetItemString(d,"CB_DROPDOWN", SWIG_FromInt((int)wxCB_DROPDOWN)); + PyDict_SetItemString(d,"CB_SORT", SWIG_FromInt((int)wxCB_SORT)); + PyDict_SetItemString(d,"CB_READONLY", SWIG_FromInt((int)wxCB_READONLY)); + PyDict_SetItemString(d,"RA_HORIZONTAL", SWIG_FromInt((int)wxRA_HORIZONTAL)); + PyDict_SetItemString(d,"RA_VERTICAL", SWIG_FromInt((int)wxRA_VERTICAL)); + PyDict_SetItemString(d,"RA_SPECIFY_ROWS", SWIG_FromInt((int)wxRA_SPECIFY_ROWS)); + PyDict_SetItemString(d,"RA_SPECIFY_COLS", SWIG_FromInt((int)wxRA_SPECIFY_COLS)); + PyDict_SetItemString(d,"RB_GROUP", SWIG_FromInt((int)wxRB_GROUP)); + PyDict_SetItemString(d,"RB_SINGLE", SWIG_FromInt((int)wxRB_SINGLE)); + PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_FromInt((int)wxSL_HORIZONTAL)); + PyDict_SetItemString(d,"SL_VERTICAL", SWIG_FromInt((int)wxSL_VERTICAL)); + PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_FromInt((int)wxSL_AUTOTICKS)); + PyDict_SetItemString(d,"SL_LABELS", SWIG_FromInt((int)wxSL_LABELS)); + PyDict_SetItemString(d,"SL_LEFT", SWIG_FromInt((int)wxSL_LEFT)); + PyDict_SetItemString(d,"SL_TOP", SWIG_FromInt((int)wxSL_TOP)); + PyDict_SetItemString(d,"SL_RIGHT", SWIG_FromInt((int)wxSL_RIGHT)); + PyDict_SetItemString(d,"SL_BOTTOM", SWIG_FromInt((int)wxSL_BOTTOM)); + PyDict_SetItemString(d,"SL_BOTH", SWIG_FromInt((int)wxSL_BOTH)); + PyDict_SetItemString(d,"SL_SELRANGE", SWIG_FromInt((int)wxSL_SELRANGE)); + PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_FromInt((int)wxSB_HORIZONTAL)); + PyDict_SetItemString(d,"SB_VERTICAL", SWIG_FromInt((int)wxSB_VERTICAL)); + PyDict_SetItemString(d,"ST_SIZEGRIP", SWIG_FromInt((int)wxST_SIZEGRIP)); + PyDict_SetItemString(d,"ST_NO_AUTORESIZE", SWIG_FromInt((int)wxST_NO_AUTORESIZE)); + PyDict_SetItemString(d,"FLOOD_SURFACE", SWIG_FromInt((int)wxFLOOD_SURFACE)); + PyDict_SetItemString(d,"FLOOD_BORDER", SWIG_FromInt((int)wxFLOOD_BORDER)); + PyDict_SetItemString(d,"ODDEVEN_RULE", SWIG_FromInt((int)wxODDEVEN_RULE)); + PyDict_SetItemString(d,"WINDING_RULE", SWIG_FromInt((int)wxWINDING_RULE)); + PyDict_SetItemString(d,"TOOL_TOP", SWIG_FromInt((int)wxTOOL_TOP)); + PyDict_SetItemString(d,"TOOL_BOTTOM", SWIG_FromInt((int)wxTOOL_BOTTOM)); + PyDict_SetItemString(d,"TOOL_LEFT", SWIG_FromInt((int)wxTOOL_LEFT)); + PyDict_SetItemString(d,"TOOL_RIGHT", SWIG_FromInt((int)wxTOOL_RIGHT)); + PyDict_SetItemString(d,"OK", SWIG_FromInt((int)wxOK)); + PyDict_SetItemString(d,"YES_NO", SWIG_FromInt((int)wxYES_NO)); + PyDict_SetItemString(d,"CANCEL", SWIG_FromInt((int)wxCANCEL)); + PyDict_SetItemString(d,"YES", SWIG_FromInt((int)wxYES)); + PyDict_SetItemString(d,"NO", SWIG_FromInt((int)wxNO)); + PyDict_SetItemString(d,"NO_DEFAULT", SWIG_FromInt((int)wxNO_DEFAULT)); + PyDict_SetItemString(d,"YES_DEFAULT", SWIG_FromInt((int)wxYES_DEFAULT)); + PyDict_SetItemString(d,"ICON_EXCLAMATION", SWIG_FromInt((int)wxICON_EXCLAMATION)); + PyDict_SetItemString(d,"ICON_HAND", SWIG_FromInt((int)wxICON_HAND)); + PyDict_SetItemString(d,"ICON_QUESTION", SWIG_FromInt((int)wxICON_QUESTION)); + PyDict_SetItemString(d,"ICON_INFORMATION", SWIG_FromInt((int)wxICON_INFORMATION)); + PyDict_SetItemString(d,"ICON_STOP", SWIG_FromInt((int)wxICON_STOP)); + PyDict_SetItemString(d,"ICON_ASTERISK", SWIG_FromInt((int)wxICON_ASTERISK)); + PyDict_SetItemString(d,"ICON_MASK", SWIG_FromInt((int)wxICON_MASK)); + PyDict_SetItemString(d,"ICON_WARNING", SWIG_FromInt((int)wxICON_WARNING)); + PyDict_SetItemString(d,"ICON_ERROR", SWIG_FromInt((int)wxICON_ERROR)); + PyDict_SetItemString(d,"FORWARD", SWIG_FromInt((int)wxFORWARD)); + PyDict_SetItemString(d,"BACKWARD", SWIG_FromInt((int)wxBACKWARD)); + PyDict_SetItemString(d,"RESET", SWIG_FromInt((int)wxRESET)); + PyDict_SetItemString(d,"HELP", SWIG_FromInt((int)wxHELP)); + PyDict_SetItemString(d,"MORE", SWIG_FromInt((int)wxMORE)); + PyDict_SetItemString(d,"SETUP", SWIG_FromInt((int)wxSETUP)); + PyDict_SetItemString(d,"SIZE_AUTO_WIDTH", SWIG_FromInt((int)wxSIZE_AUTO_WIDTH)); + PyDict_SetItemString(d,"SIZE_AUTO_HEIGHT", SWIG_FromInt((int)wxSIZE_AUTO_HEIGHT)); + PyDict_SetItemString(d,"SIZE_AUTO", SWIG_FromInt((int)wxSIZE_AUTO)); + PyDict_SetItemString(d,"SIZE_USE_EXISTING", SWIG_FromInt((int)wxSIZE_USE_EXISTING)); + PyDict_SetItemString(d,"SIZE_ALLOW_MINUS_ONE", SWIG_FromInt((int)wxSIZE_ALLOW_MINUS_ONE)); + PyDict_SetItemString(d,"PORTRAIT", SWIG_FromInt((int)wxPORTRAIT)); + PyDict_SetItemString(d,"LANDSCAPE", SWIG_FromInt((int)wxLANDSCAPE)); + PyDict_SetItemString(d,"PRINT_QUALITY_HIGH", SWIG_FromInt((int)wxPRINT_QUALITY_HIGH)); + PyDict_SetItemString(d,"PRINT_QUALITY_MEDIUM", SWIG_FromInt((int)wxPRINT_QUALITY_MEDIUM)); + PyDict_SetItemString(d,"PRINT_QUALITY_LOW", SWIG_FromInt((int)wxPRINT_QUALITY_LOW)); + PyDict_SetItemString(d,"PRINT_QUALITY_DRAFT", SWIG_FromInt((int)wxPRINT_QUALITY_DRAFT)); + PyDict_SetItemString(d,"ID_ANY", SWIG_FromInt((int)wxID_ANY)); + PyDict_SetItemString(d,"ID_SEPARATOR", SWIG_FromInt((int)wxID_SEPARATOR)); + PyDict_SetItemString(d,"ID_LOWEST", SWIG_FromInt((int)wxID_LOWEST)); + PyDict_SetItemString(d,"ID_OPEN", SWIG_FromInt((int)wxID_OPEN)); + PyDict_SetItemString(d,"ID_CLOSE", SWIG_FromInt((int)wxID_CLOSE)); + PyDict_SetItemString(d,"ID_NEW", SWIG_FromInt((int)wxID_NEW)); + PyDict_SetItemString(d,"ID_SAVE", SWIG_FromInt((int)wxID_SAVE)); + PyDict_SetItemString(d,"ID_SAVEAS", SWIG_FromInt((int)wxID_SAVEAS)); + PyDict_SetItemString(d,"ID_REVERT", SWIG_FromInt((int)wxID_REVERT)); + PyDict_SetItemString(d,"ID_EXIT", SWIG_FromInt((int)wxID_EXIT)); + PyDict_SetItemString(d,"ID_UNDO", SWIG_FromInt((int)wxID_UNDO)); + PyDict_SetItemString(d,"ID_REDO", SWIG_FromInt((int)wxID_REDO)); + PyDict_SetItemString(d,"ID_HELP", SWIG_FromInt((int)wxID_HELP)); + PyDict_SetItemString(d,"ID_PRINT", SWIG_FromInt((int)wxID_PRINT)); + PyDict_SetItemString(d,"ID_PRINT_SETUP", SWIG_FromInt((int)wxID_PRINT_SETUP)); + PyDict_SetItemString(d,"ID_PREVIEW", SWIG_FromInt((int)wxID_PREVIEW)); + PyDict_SetItemString(d,"ID_ABOUT", SWIG_FromInt((int)wxID_ABOUT)); + PyDict_SetItemString(d,"ID_HELP_CONTENTS", SWIG_FromInt((int)wxID_HELP_CONTENTS)); + PyDict_SetItemString(d,"ID_HELP_COMMANDS", SWIG_FromInt((int)wxID_HELP_COMMANDS)); + PyDict_SetItemString(d,"ID_HELP_PROCEDURES", SWIG_FromInt((int)wxID_HELP_PROCEDURES)); + PyDict_SetItemString(d,"ID_HELP_CONTEXT", SWIG_FromInt((int)wxID_HELP_CONTEXT)); + PyDict_SetItemString(d,"ID_CLOSE_ALL", SWIG_FromInt((int)wxID_CLOSE_ALL)); + PyDict_SetItemString(d,"ID_PREFERENCES", SWIG_FromInt((int)wxID_PREFERENCES)); + PyDict_SetItemString(d,"ID_CUT", SWIG_FromInt((int)wxID_CUT)); + PyDict_SetItemString(d,"ID_COPY", SWIG_FromInt((int)wxID_COPY)); + PyDict_SetItemString(d,"ID_PASTE", SWIG_FromInt((int)wxID_PASTE)); + PyDict_SetItemString(d,"ID_CLEAR", SWIG_FromInt((int)wxID_CLEAR)); + PyDict_SetItemString(d,"ID_FIND", SWIG_FromInt((int)wxID_FIND)); + PyDict_SetItemString(d,"ID_DUPLICATE", SWIG_FromInt((int)wxID_DUPLICATE)); + PyDict_SetItemString(d,"ID_SELECTALL", SWIG_FromInt((int)wxID_SELECTALL)); + PyDict_SetItemString(d,"ID_DELETE", SWIG_FromInt((int)wxID_DELETE)); + PyDict_SetItemString(d,"ID_REPLACE", SWIG_FromInt((int)wxID_REPLACE)); + PyDict_SetItemString(d,"ID_REPLACE_ALL", SWIG_FromInt((int)wxID_REPLACE_ALL)); + PyDict_SetItemString(d,"ID_PROPERTIES", SWIG_FromInt((int)wxID_PROPERTIES)); + PyDict_SetItemString(d,"ID_VIEW_DETAILS", SWIG_FromInt((int)wxID_VIEW_DETAILS)); + PyDict_SetItemString(d,"ID_VIEW_LARGEICONS", SWIG_FromInt((int)wxID_VIEW_LARGEICONS)); + PyDict_SetItemString(d,"ID_VIEW_SMALLICONS", SWIG_FromInt((int)wxID_VIEW_SMALLICONS)); + PyDict_SetItemString(d,"ID_VIEW_LIST", SWIG_FromInt((int)wxID_VIEW_LIST)); + PyDict_SetItemString(d,"ID_VIEW_SORTDATE", SWIG_FromInt((int)wxID_VIEW_SORTDATE)); + PyDict_SetItemString(d,"ID_VIEW_SORTNAME", SWIG_FromInt((int)wxID_VIEW_SORTNAME)); + PyDict_SetItemString(d,"ID_VIEW_SORTSIZE", SWIG_FromInt((int)wxID_VIEW_SORTSIZE)); + PyDict_SetItemString(d,"ID_VIEW_SORTTYPE", SWIG_FromInt((int)wxID_VIEW_SORTTYPE)); + PyDict_SetItemString(d,"ID_FILE1", SWIG_FromInt((int)wxID_FILE1)); + PyDict_SetItemString(d,"ID_FILE2", SWIG_FromInt((int)wxID_FILE2)); + PyDict_SetItemString(d,"ID_FILE3", SWIG_FromInt((int)wxID_FILE3)); + PyDict_SetItemString(d,"ID_FILE4", SWIG_FromInt((int)wxID_FILE4)); + PyDict_SetItemString(d,"ID_FILE5", SWIG_FromInt((int)wxID_FILE5)); + PyDict_SetItemString(d,"ID_FILE6", SWIG_FromInt((int)wxID_FILE6)); + PyDict_SetItemString(d,"ID_FILE7", SWIG_FromInt((int)wxID_FILE7)); + PyDict_SetItemString(d,"ID_FILE8", SWIG_FromInt((int)wxID_FILE8)); + PyDict_SetItemString(d,"ID_FILE9", SWIG_FromInt((int)wxID_FILE9)); + PyDict_SetItemString(d,"ID_OK", SWIG_FromInt((int)wxID_OK)); + PyDict_SetItemString(d,"ID_CANCEL", SWIG_FromInt((int)wxID_CANCEL)); + PyDict_SetItemString(d,"ID_APPLY", SWIG_FromInt((int)wxID_APPLY)); + PyDict_SetItemString(d,"ID_YES", SWIG_FromInt((int)wxID_YES)); + PyDict_SetItemString(d,"ID_NO", SWIG_FromInt((int)wxID_NO)); + PyDict_SetItemString(d,"ID_STATIC", SWIG_FromInt((int)wxID_STATIC)); + PyDict_SetItemString(d,"ID_FORWARD", SWIG_FromInt((int)wxID_FORWARD)); + PyDict_SetItemString(d,"ID_BACKWARD", SWIG_FromInt((int)wxID_BACKWARD)); + PyDict_SetItemString(d,"ID_DEFAULT", SWIG_FromInt((int)wxID_DEFAULT)); + PyDict_SetItemString(d,"ID_MORE", SWIG_FromInt((int)wxID_MORE)); + PyDict_SetItemString(d,"ID_SETUP", SWIG_FromInt((int)wxID_SETUP)); + PyDict_SetItemString(d,"ID_RESET", SWIG_FromInt((int)wxID_RESET)); + PyDict_SetItemString(d,"ID_CONTEXT_HELP", SWIG_FromInt((int)wxID_CONTEXT_HELP)); + PyDict_SetItemString(d,"ID_YESTOALL", SWIG_FromInt((int)wxID_YESTOALL)); + PyDict_SetItemString(d,"ID_NOTOALL", SWIG_FromInt((int)wxID_NOTOALL)); + PyDict_SetItemString(d,"ID_ABORT", SWIG_FromInt((int)wxID_ABORT)); + PyDict_SetItemString(d,"ID_RETRY", SWIG_FromInt((int)wxID_RETRY)); + PyDict_SetItemString(d,"ID_IGNORE", SWIG_FromInt((int)wxID_IGNORE)); + PyDict_SetItemString(d,"ID_HIGHEST", SWIG_FromInt((int)wxID_HIGHEST)); + PyDict_SetItemString(d,"OPEN", SWIG_FromInt((int)wxOPEN)); + PyDict_SetItemString(d,"SAVE", SWIG_FromInt((int)wxSAVE)); + PyDict_SetItemString(d,"HIDE_READONLY", SWIG_FromInt((int)wxHIDE_READONLY)); + PyDict_SetItemString(d,"OVERWRITE_PROMPT", SWIG_FromInt((int)wxOVERWRITE_PROMPT)); + PyDict_SetItemString(d,"FILE_MUST_EXIST", SWIG_FromInt((int)wxFILE_MUST_EXIST)); + PyDict_SetItemString(d,"MULTIPLE", SWIG_FromInt((int)wxMULTIPLE)); + PyDict_SetItemString(d,"CHANGE_DIR", SWIG_FromInt((int)wxCHANGE_DIR)); + PyDict_SetItemString(d,"ACCEL_ALT", SWIG_FromInt((int)wxACCEL_ALT)); + PyDict_SetItemString(d,"ACCEL_CTRL", SWIG_FromInt((int)wxACCEL_CTRL)); + PyDict_SetItemString(d,"ACCEL_SHIFT", SWIG_FromInt((int)wxACCEL_SHIFT)); + PyDict_SetItemString(d,"ACCEL_NORMAL", SWIG_FromInt((int)wxACCEL_NORMAL)); + PyDict_SetItemString(d,"PD_AUTO_HIDE", SWIG_FromInt((int)wxPD_AUTO_HIDE)); + PyDict_SetItemString(d,"PD_APP_MODAL", SWIG_FromInt((int)wxPD_APP_MODAL)); + PyDict_SetItemString(d,"PD_CAN_ABORT", SWIG_FromInt((int)wxPD_CAN_ABORT)); + PyDict_SetItemString(d,"PD_ELAPSED_TIME", SWIG_FromInt((int)wxPD_ELAPSED_TIME)); + PyDict_SetItemString(d,"PD_ESTIMATED_TIME", SWIG_FromInt((int)wxPD_ESTIMATED_TIME)); + PyDict_SetItemString(d,"PD_REMAINING_TIME", SWIG_FromInt((int)wxPD_REMAINING_TIME)); + PyDict_SetItemString(d,"DD_NEW_DIR_BUTTON", SWIG_FromInt((int)wxDD_NEW_DIR_BUTTON)); + PyDict_SetItemString(d,"DD_DEFAULT_STYLE", SWIG_FromInt((int)wxDD_DEFAULT_STYLE)); + PyDict_SetItemString(d,"MENU_TEAROFF", SWIG_FromInt((int)wxMENU_TEAROFF)); + PyDict_SetItemString(d,"MB_DOCKABLE", SWIG_FromInt((int)wxMB_DOCKABLE)); + PyDict_SetItemString(d,"NO_FULL_REPAINT_ON_RESIZE", SWIG_FromInt((int)wxNO_FULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"FULL_REPAINT_ON_RESIZE", SWIG_FromInt((int)wxFULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"LI_HORIZONTAL", SWIG_FromInt((int)wxLI_HORIZONTAL)); + PyDict_SetItemString(d,"LI_VERTICAL", SWIG_FromInt((int)wxLI_VERTICAL)); + PyDict_SetItemString(d,"WS_EX_VALIDATE_RECURSIVELY", SWIG_FromInt((int)wxWS_EX_VALIDATE_RECURSIVELY)); + PyDict_SetItemString(d,"WS_EX_BLOCK_EVENTS", SWIG_FromInt((int)wxWS_EX_BLOCK_EVENTS)); + PyDict_SetItemString(d,"WS_EX_TRANSIENT", SWIG_FromInt((int)wxWS_EX_TRANSIENT)); + PyDict_SetItemString(d,"WS_EX_THEMED_BACKGROUND", SWIG_FromInt((int)wxWS_EX_THEMED_BACKGROUND)); + PyDict_SetItemString(d,"WS_EX_PROCESS_IDLE", SWIG_FromInt((int)wxWS_EX_PROCESS_IDLE)); + PyDict_SetItemString(d,"WS_EX_PROCESS_UI_UPDATES", SWIG_FromInt((int)wxWS_EX_PROCESS_UI_UPDATES)); + PyDict_SetItemString(d,"MM_TEXT", SWIG_FromInt((int)wxMM_TEXT)); + PyDict_SetItemString(d,"MM_LOMETRIC", SWIG_FromInt((int)wxMM_LOMETRIC)); + PyDict_SetItemString(d,"MM_HIMETRIC", SWIG_FromInt((int)wxMM_HIMETRIC)); + PyDict_SetItemString(d,"MM_LOENGLISH", SWIG_FromInt((int)wxMM_LOENGLISH)); + PyDict_SetItemString(d,"MM_HIENGLISH", SWIG_FromInt((int)wxMM_HIENGLISH)); + PyDict_SetItemString(d,"MM_TWIPS", SWIG_FromInt((int)wxMM_TWIPS)); + PyDict_SetItemString(d,"MM_ISOTROPIC", SWIG_FromInt((int)wxMM_ISOTROPIC)); + PyDict_SetItemString(d,"MM_ANISOTROPIC", SWIG_FromInt((int)wxMM_ANISOTROPIC)); + PyDict_SetItemString(d,"MM_POINTS", SWIG_FromInt((int)wxMM_POINTS)); + PyDict_SetItemString(d,"MM_METRIC", SWIG_FromInt((int)wxMM_METRIC)); + PyDict_SetItemString(d,"CENTRE", SWIG_FromInt((int)wxCENTRE)); + PyDict_SetItemString(d,"CENTER", SWIG_FromInt((int)wxCENTER)); + PyDict_SetItemString(d,"HORIZONTAL", SWIG_FromInt((int)wxHORIZONTAL)); + PyDict_SetItemString(d,"VERTICAL", SWIG_FromInt((int)wxVERTICAL)); + PyDict_SetItemString(d,"BOTH", SWIG_FromInt((int)wxBOTH)); + PyDict_SetItemString(d,"LEFT", SWIG_FromInt((int)wxLEFT)); + PyDict_SetItemString(d,"RIGHT", SWIG_FromInt((int)wxRIGHT)); + PyDict_SetItemString(d,"UP", SWIG_FromInt((int)wxUP)); + PyDict_SetItemString(d,"DOWN", SWIG_FromInt((int)wxDOWN)); + PyDict_SetItemString(d,"TOP", SWIG_FromInt((int)wxTOP)); + PyDict_SetItemString(d,"BOTTOM", SWIG_FromInt((int)wxBOTTOM)); + PyDict_SetItemString(d,"NORTH", SWIG_FromInt((int)wxNORTH)); + PyDict_SetItemString(d,"SOUTH", SWIG_FromInt((int)wxSOUTH)); + PyDict_SetItemString(d,"WEST", SWIG_FromInt((int)wxWEST)); + PyDict_SetItemString(d,"EAST", SWIG_FromInt((int)wxEAST)); + PyDict_SetItemString(d,"ALL", SWIG_FromInt((int)wxALL)); + PyDict_SetItemString(d,"ALIGN_NOT", SWIG_FromInt((int)wxALIGN_NOT)); + PyDict_SetItemString(d,"ALIGN_CENTER_HORIZONTAL", SWIG_FromInt((int)wxALIGN_CENTER_HORIZONTAL)); + PyDict_SetItemString(d,"ALIGN_CENTRE_HORIZONTAL", SWIG_FromInt((int)wxALIGN_CENTRE_HORIZONTAL)); + PyDict_SetItemString(d,"ALIGN_LEFT", SWIG_FromInt((int)wxALIGN_LEFT)); + PyDict_SetItemString(d,"ALIGN_TOP", SWIG_FromInt((int)wxALIGN_TOP)); + PyDict_SetItemString(d,"ALIGN_RIGHT", SWIG_FromInt((int)wxALIGN_RIGHT)); + PyDict_SetItemString(d,"ALIGN_BOTTOM", SWIG_FromInt((int)wxALIGN_BOTTOM)); + PyDict_SetItemString(d,"ALIGN_CENTER_VERTICAL", SWIG_FromInt((int)wxALIGN_CENTER_VERTICAL)); + PyDict_SetItemString(d,"ALIGN_CENTRE_VERTICAL", SWIG_FromInt((int)wxALIGN_CENTRE_VERTICAL)); + PyDict_SetItemString(d,"ALIGN_CENTER", SWIG_FromInt((int)wxALIGN_CENTER)); + PyDict_SetItemString(d,"ALIGN_CENTRE", SWIG_FromInt((int)wxALIGN_CENTRE)); + PyDict_SetItemString(d,"ALIGN_MASK", SWIG_FromInt((int)wxALIGN_MASK)); + PyDict_SetItemString(d,"STRETCH_NOT", SWIG_FromInt((int)wxSTRETCH_NOT)); + PyDict_SetItemString(d,"SHRINK", SWIG_FromInt((int)wxSHRINK)); + PyDict_SetItemString(d,"GROW", SWIG_FromInt((int)wxGROW)); + PyDict_SetItemString(d,"EXPAND", SWIG_FromInt((int)wxEXPAND)); + PyDict_SetItemString(d,"SHAPED", SWIG_FromInt((int)wxSHAPED)); + PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_FromInt((int)wxADJUST_MINSIZE)); + PyDict_SetItemString(d,"TILE", SWIG_FromInt((int)wxTILE)); + PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_FromInt((int)wxBORDER_DEFAULT)); + PyDict_SetItemString(d,"BORDER_NONE", SWIG_FromInt((int)wxBORDER_NONE)); + PyDict_SetItemString(d,"BORDER_STATIC", SWIG_FromInt((int)wxBORDER_STATIC)); + PyDict_SetItemString(d,"BORDER_SIMPLE", SWIG_FromInt((int)wxBORDER_SIMPLE)); + PyDict_SetItemString(d,"BORDER_RAISED", SWIG_FromInt((int)wxBORDER_RAISED)); + PyDict_SetItemString(d,"BORDER_SUNKEN", SWIG_FromInt((int)wxBORDER_SUNKEN)); + PyDict_SetItemString(d,"BORDER_DOUBLE", SWIG_FromInt((int)wxBORDER_DOUBLE)); + PyDict_SetItemString(d,"BORDER_MASK", SWIG_FromInt((int)wxBORDER_MASK)); + PyDict_SetItemString(d,"DEFAULT", SWIG_FromInt((int)wxDEFAULT)); + PyDict_SetItemString(d,"DECORATIVE", SWIG_FromInt((int)wxDECORATIVE)); + PyDict_SetItemString(d,"ROMAN", SWIG_FromInt((int)wxROMAN)); + PyDict_SetItemString(d,"SCRIPT", SWIG_FromInt((int)wxSCRIPT)); + PyDict_SetItemString(d,"SWISS", SWIG_FromInt((int)wxSWISS)); + PyDict_SetItemString(d,"MODERN", SWIG_FromInt((int)wxMODERN)); + PyDict_SetItemString(d,"TELETYPE", SWIG_FromInt((int)wxTELETYPE)); + PyDict_SetItemString(d,"VARIABLE", SWIG_FromInt((int)wxVARIABLE)); + PyDict_SetItemString(d,"FIXED", SWIG_FromInt((int)wxFIXED)); + PyDict_SetItemString(d,"NORMAL", SWIG_FromInt((int)wxNORMAL)); + PyDict_SetItemString(d,"LIGHT", SWIG_FromInt((int)wxLIGHT)); + PyDict_SetItemString(d,"BOLD", SWIG_FromInt((int)wxBOLD)); + PyDict_SetItemString(d,"ITALIC", SWIG_FromInt((int)wxITALIC)); + PyDict_SetItemString(d,"SLANT", SWIG_FromInt((int)wxSLANT)); + PyDict_SetItemString(d,"SOLID", SWIG_FromInt((int)wxSOLID)); + PyDict_SetItemString(d,"DOT", SWIG_FromInt((int)wxDOT)); + PyDict_SetItemString(d,"LONG_DASH", SWIG_FromInt((int)wxLONG_DASH)); + PyDict_SetItemString(d,"SHORT_DASH", SWIG_FromInt((int)wxSHORT_DASH)); + PyDict_SetItemString(d,"DOT_DASH", SWIG_FromInt((int)wxDOT_DASH)); + PyDict_SetItemString(d,"USER_DASH", SWIG_FromInt((int)wxUSER_DASH)); + PyDict_SetItemString(d,"TRANSPARENT", SWIG_FromInt((int)wxTRANSPARENT)); + PyDict_SetItemString(d,"STIPPLE", SWIG_FromInt((int)wxSTIPPLE)); + PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_FromInt((int)wxBDIAGONAL_HATCH)); + PyDict_SetItemString(d,"CROSSDIAG_HATCH", SWIG_FromInt((int)wxCROSSDIAG_HATCH)); + PyDict_SetItemString(d,"FDIAGONAL_HATCH", SWIG_FromInt((int)wxFDIAGONAL_HATCH)); + PyDict_SetItemString(d,"CROSS_HATCH", SWIG_FromInt((int)wxCROSS_HATCH)); + PyDict_SetItemString(d,"HORIZONTAL_HATCH", SWIG_FromInt((int)wxHORIZONTAL_HATCH)); + PyDict_SetItemString(d,"VERTICAL_HATCH", SWIG_FromInt((int)wxVERTICAL_HATCH)); + PyDict_SetItemString(d,"JOIN_BEVEL", SWIG_FromInt((int)wxJOIN_BEVEL)); + PyDict_SetItemString(d,"JOIN_MITER", SWIG_FromInt((int)wxJOIN_MITER)); + PyDict_SetItemString(d,"JOIN_ROUND", SWIG_FromInt((int)wxJOIN_ROUND)); + PyDict_SetItemString(d,"CAP_ROUND", SWIG_FromInt((int)wxCAP_ROUND)); + PyDict_SetItemString(d,"CAP_PROJECTING", SWIG_FromInt((int)wxCAP_PROJECTING)); + PyDict_SetItemString(d,"CAP_BUTT", SWIG_FromInt((int)wxCAP_BUTT)); + PyDict_SetItemString(d,"CLEAR", SWIG_FromInt((int)wxCLEAR)); + PyDict_SetItemString(d,"XOR", SWIG_FromInt((int)wxXOR)); + PyDict_SetItemString(d,"INVERT", SWIG_FromInt((int)wxINVERT)); + PyDict_SetItemString(d,"OR_REVERSE", SWIG_FromInt((int)wxOR_REVERSE)); + PyDict_SetItemString(d,"AND_REVERSE", SWIG_FromInt((int)wxAND_REVERSE)); + PyDict_SetItemString(d,"COPY", SWIG_FromInt((int)wxCOPY)); + PyDict_SetItemString(d,"AND", SWIG_FromInt((int)wxAND)); + PyDict_SetItemString(d,"AND_INVERT", SWIG_FromInt((int)wxAND_INVERT)); + PyDict_SetItemString(d,"NO_OP", SWIG_FromInt((int)wxNO_OP)); + PyDict_SetItemString(d,"NOR", SWIG_FromInt((int)wxNOR)); + PyDict_SetItemString(d,"EQUIV", SWIG_FromInt((int)wxEQUIV)); + PyDict_SetItemString(d,"SRC_INVERT", SWIG_FromInt((int)wxSRC_INVERT)); + PyDict_SetItemString(d,"OR_INVERT", SWIG_FromInt((int)wxOR_INVERT)); + PyDict_SetItemString(d,"NAND", SWIG_FromInt((int)wxNAND)); + PyDict_SetItemString(d,"OR", SWIG_FromInt((int)wxOR)); + PyDict_SetItemString(d,"SET", SWIG_FromInt((int)wxSET)); + PyDict_SetItemString(d,"WXK_BACK", SWIG_FromInt((int)WXK_BACK)); + PyDict_SetItemString(d,"WXK_TAB", SWIG_FromInt((int)WXK_TAB)); + PyDict_SetItemString(d,"WXK_RETURN", SWIG_FromInt((int)WXK_RETURN)); + PyDict_SetItemString(d,"WXK_ESCAPE", SWIG_FromInt((int)WXK_ESCAPE)); + PyDict_SetItemString(d,"WXK_SPACE", SWIG_FromInt((int)WXK_SPACE)); + PyDict_SetItemString(d,"WXK_DELETE", SWIG_FromInt((int)WXK_DELETE)); + PyDict_SetItemString(d,"WXK_START", SWIG_FromInt((int)WXK_START)); + PyDict_SetItemString(d,"WXK_LBUTTON", SWIG_FromInt((int)WXK_LBUTTON)); + PyDict_SetItemString(d,"WXK_RBUTTON", SWIG_FromInt((int)WXK_RBUTTON)); + PyDict_SetItemString(d,"WXK_CANCEL", SWIG_FromInt((int)WXK_CANCEL)); + PyDict_SetItemString(d,"WXK_MBUTTON", SWIG_FromInt((int)WXK_MBUTTON)); + PyDict_SetItemString(d,"WXK_CLEAR", SWIG_FromInt((int)WXK_CLEAR)); + PyDict_SetItemString(d,"WXK_SHIFT", SWIG_FromInt((int)WXK_SHIFT)); + PyDict_SetItemString(d,"WXK_ALT", SWIG_FromInt((int)WXK_ALT)); + PyDict_SetItemString(d,"WXK_CONTROL", SWIG_FromInt((int)WXK_CONTROL)); + PyDict_SetItemString(d,"WXK_MENU", SWIG_FromInt((int)WXK_MENU)); + PyDict_SetItemString(d,"WXK_PAUSE", SWIG_FromInt((int)WXK_PAUSE)); + PyDict_SetItemString(d,"WXK_CAPITAL", SWIG_FromInt((int)WXK_CAPITAL)); + PyDict_SetItemString(d,"WXK_PRIOR", SWIG_FromInt((int)WXK_PRIOR)); + PyDict_SetItemString(d,"WXK_NEXT", SWIG_FromInt((int)WXK_NEXT)); + PyDict_SetItemString(d,"WXK_END", SWIG_FromInt((int)WXK_END)); + PyDict_SetItemString(d,"WXK_HOME", SWIG_FromInt((int)WXK_HOME)); + PyDict_SetItemString(d,"WXK_LEFT", SWIG_FromInt((int)WXK_LEFT)); + PyDict_SetItemString(d,"WXK_UP", SWIG_FromInt((int)WXK_UP)); + PyDict_SetItemString(d,"WXK_RIGHT", SWIG_FromInt((int)WXK_RIGHT)); + PyDict_SetItemString(d,"WXK_DOWN", SWIG_FromInt((int)WXK_DOWN)); + PyDict_SetItemString(d,"WXK_SELECT", SWIG_FromInt((int)WXK_SELECT)); + PyDict_SetItemString(d,"WXK_PRINT", SWIG_FromInt((int)WXK_PRINT)); + PyDict_SetItemString(d,"WXK_EXECUTE", SWIG_FromInt((int)WXK_EXECUTE)); + PyDict_SetItemString(d,"WXK_SNAPSHOT", SWIG_FromInt((int)WXK_SNAPSHOT)); + PyDict_SetItemString(d,"WXK_INSERT", SWIG_FromInt((int)WXK_INSERT)); + PyDict_SetItemString(d,"WXK_HELP", SWIG_FromInt((int)WXK_HELP)); + PyDict_SetItemString(d,"WXK_NUMPAD0", SWIG_FromInt((int)WXK_NUMPAD0)); + PyDict_SetItemString(d,"WXK_NUMPAD1", SWIG_FromInt((int)WXK_NUMPAD1)); + PyDict_SetItemString(d,"WXK_NUMPAD2", SWIG_FromInt((int)WXK_NUMPAD2)); + PyDict_SetItemString(d,"WXK_NUMPAD3", SWIG_FromInt((int)WXK_NUMPAD3)); + PyDict_SetItemString(d,"WXK_NUMPAD4", SWIG_FromInt((int)WXK_NUMPAD4)); + PyDict_SetItemString(d,"WXK_NUMPAD5", SWIG_FromInt((int)WXK_NUMPAD5)); + PyDict_SetItemString(d,"WXK_NUMPAD6", SWIG_FromInt((int)WXK_NUMPAD6)); + PyDict_SetItemString(d,"WXK_NUMPAD7", SWIG_FromInt((int)WXK_NUMPAD7)); + PyDict_SetItemString(d,"WXK_NUMPAD8", SWIG_FromInt((int)WXK_NUMPAD8)); + PyDict_SetItemString(d,"WXK_NUMPAD9", SWIG_FromInt((int)WXK_NUMPAD9)); + PyDict_SetItemString(d,"WXK_MULTIPLY", SWIG_FromInt((int)WXK_MULTIPLY)); + PyDict_SetItemString(d,"WXK_ADD", SWIG_FromInt((int)WXK_ADD)); + PyDict_SetItemString(d,"WXK_SEPARATOR", SWIG_FromInt((int)WXK_SEPARATOR)); + PyDict_SetItemString(d,"WXK_SUBTRACT", SWIG_FromInt((int)WXK_SUBTRACT)); + PyDict_SetItemString(d,"WXK_DECIMAL", SWIG_FromInt((int)WXK_DECIMAL)); + PyDict_SetItemString(d,"WXK_DIVIDE", SWIG_FromInt((int)WXK_DIVIDE)); + PyDict_SetItemString(d,"WXK_F1", SWIG_FromInt((int)WXK_F1)); + PyDict_SetItemString(d,"WXK_F2", SWIG_FromInt((int)WXK_F2)); + PyDict_SetItemString(d,"WXK_F3", SWIG_FromInt((int)WXK_F3)); + PyDict_SetItemString(d,"WXK_F4", SWIG_FromInt((int)WXK_F4)); + PyDict_SetItemString(d,"WXK_F5", SWIG_FromInt((int)WXK_F5)); + PyDict_SetItemString(d,"WXK_F6", SWIG_FromInt((int)WXK_F6)); + PyDict_SetItemString(d,"WXK_F7", SWIG_FromInt((int)WXK_F7)); + PyDict_SetItemString(d,"WXK_F8", SWIG_FromInt((int)WXK_F8)); + PyDict_SetItemString(d,"WXK_F9", SWIG_FromInt((int)WXK_F9)); + PyDict_SetItemString(d,"WXK_F10", SWIG_FromInt((int)WXK_F10)); + PyDict_SetItemString(d,"WXK_F11", SWIG_FromInt((int)WXK_F11)); + PyDict_SetItemString(d,"WXK_F12", SWIG_FromInt((int)WXK_F12)); + PyDict_SetItemString(d,"WXK_F13", SWIG_FromInt((int)WXK_F13)); + PyDict_SetItemString(d,"WXK_F14", SWIG_FromInt((int)WXK_F14)); + PyDict_SetItemString(d,"WXK_F15", SWIG_FromInt((int)WXK_F15)); + PyDict_SetItemString(d,"WXK_F16", SWIG_FromInt((int)WXK_F16)); + PyDict_SetItemString(d,"WXK_F17", SWIG_FromInt((int)WXK_F17)); + PyDict_SetItemString(d,"WXK_F18", SWIG_FromInt((int)WXK_F18)); + PyDict_SetItemString(d,"WXK_F19", SWIG_FromInt((int)WXK_F19)); + PyDict_SetItemString(d,"WXK_F20", SWIG_FromInt((int)WXK_F20)); + PyDict_SetItemString(d,"WXK_F21", SWIG_FromInt((int)WXK_F21)); + PyDict_SetItemString(d,"WXK_F22", SWIG_FromInt((int)WXK_F22)); + PyDict_SetItemString(d,"WXK_F23", SWIG_FromInt((int)WXK_F23)); + PyDict_SetItemString(d,"WXK_F24", SWIG_FromInt((int)WXK_F24)); + PyDict_SetItemString(d,"WXK_NUMLOCK", SWIG_FromInt((int)WXK_NUMLOCK)); + PyDict_SetItemString(d,"WXK_SCROLL", SWIG_FromInt((int)WXK_SCROLL)); + PyDict_SetItemString(d,"WXK_PAGEUP", SWIG_FromInt((int)WXK_PAGEUP)); + PyDict_SetItemString(d,"WXK_PAGEDOWN", SWIG_FromInt((int)WXK_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_SPACE", SWIG_FromInt((int)WXK_NUMPAD_SPACE)); + PyDict_SetItemString(d,"WXK_NUMPAD_TAB", SWIG_FromInt((int)WXK_NUMPAD_TAB)); + PyDict_SetItemString(d,"WXK_NUMPAD_ENTER", SWIG_FromInt((int)WXK_NUMPAD_ENTER)); + PyDict_SetItemString(d,"WXK_NUMPAD_F1", SWIG_FromInt((int)WXK_NUMPAD_F1)); + PyDict_SetItemString(d,"WXK_NUMPAD_F2", SWIG_FromInt((int)WXK_NUMPAD_F2)); + PyDict_SetItemString(d,"WXK_NUMPAD_F3", SWIG_FromInt((int)WXK_NUMPAD_F3)); + PyDict_SetItemString(d,"WXK_NUMPAD_F4", SWIG_FromInt((int)WXK_NUMPAD_F4)); + PyDict_SetItemString(d,"WXK_NUMPAD_HOME", SWIG_FromInt((int)WXK_NUMPAD_HOME)); + PyDict_SetItemString(d,"WXK_NUMPAD_LEFT", SWIG_FromInt((int)WXK_NUMPAD_LEFT)); + PyDict_SetItemString(d,"WXK_NUMPAD_UP", SWIG_FromInt((int)WXK_NUMPAD_UP)); + PyDict_SetItemString(d,"WXK_NUMPAD_RIGHT", SWIG_FromInt((int)WXK_NUMPAD_RIGHT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DOWN", SWIG_FromInt((int)WXK_NUMPAD_DOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_PRIOR", SWIG_FromInt((int)WXK_NUMPAD_PRIOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEUP", SWIG_FromInt((int)WXK_NUMPAD_PAGEUP)); + PyDict_SetItemString(d,"WXK_NUMPAD_NEXT", SWIG_FromInt((int)WXK_NUMPAD_NEXT)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEDOWN", SWIG_FromInt((int)WXK_NUMPAD_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_END", SWIG_FromInt((int)WXK_NUMPAD_END)); + PyDict_SetItemString(d,"WXK_NUMPAD_BEGIN", SWIG_FromInt((int)WXK_NUMPAD_BEGIN)); + PyDict_SetItemString(d,"WXK_NUMPAD_INSERT", SWIG_FromInt((int)WXK_NUMPAD_INSERT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DELETE", SWIG_FromInt((int)WXK_NUMPAD_DELETE)); + PyDict_SetItemString(d,"WXK_NUMPAD_EQUAL", SWIG_FromInt((int)WXK_NUMPAD_EQUAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_MULTIPLY", SWIG_FromInt((int)WXK_NUMPAD_MULTIPLY)); + PyDict_SetItemString(d,"WXK_NUMPAD_ADD", SWIG_FromInt((int)WXK_NUMPAD_ADD)); + PyDict_SetItemString(d,"WXK_NUMPAD_SEPARATOR", SWIG_FromInt((int)WXK_NUMPAD_SEPARATOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_SUBTRACT", SWIG_FromInt((int)WXK_NUMPAD_SUBTRACT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DECIMAL", SWIG_FromInt((int)WXK_NUMPAD_DECIMAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_DIVIDE", SWIG_FromInt((int)WXK_NUMPAD_DIVIDE)); + PyDict_SetItemString(d,"WXK_WINDOWS_LEFT", SWIG_FromInt((int)WXK_WINDOWS_LEFT)); + PyDict_SetItemString(d,"WXK_WINDOWS_RIGHT", SWIG_FromInt((int)WXK_WINDOWS_RIGHT)); + PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_FromInt((int)WXK_WINDOWS_MENU)); + PyDict_SetItemString(d,"PAPER_NONE", SWIG_FromInt((int)wxPAPER_NONE)); + PyDict_SetItemString(d,"PAPER_LETTER", SWIG_FromInt((int)wxPAPER_LETTER)); + PyDict_SetItemString(d,"PAPER_LEGAL", SWIG_FromInt((int)wxPAPER_LEGAL)); + PyDict_SetItemString(d,"PAPER_A4", SWIG_FromInt((int)wxPAPER_A4)); + PyDict_SetItemString(d,"PAPER_CSHEET", SWIG_FromInt((int)wxPAPER_CSHEET)); + PyDict_SetItemString(d,"PAPER_DSHEET", SWIG_FromInt((int)wxPAPER_DSHEET)); + PyDict_SetItemString(d,"PAPER_ESHEET", SWIG_FromInt((int)wxPAPER_ESHEET)); + PyDict_SetItemString(d,"PAPER_LETTERSMALL", SWIG_FromInt((int)wxPAPER_LETTERSMALL)); + PyDict_SetItemString(d,"PAPER_TABLOID", SWIG_FromInt((int)wxPAPER_TABLOID)); + PyDict_SetItemString(d,"PAPER_LEDGER", SWIG_FromInt((int)wxPAPER_LEDGER)); + PyDict_SetItemString(d,"PAPER_STATEMENT", SWIG_FromInt((int)wxPAPER_STATEMENT)); + PyDict_SetItemString(d,"PAPER_EXECUTIVE", SWIG_FromInt((int)wxPAPER_EXECUTIVE)); + PyDict_SetItemString(d,"PAPER_A3", SWIG_FromInt((int)wxPAPER_A3)); + PyDict_SetItemString(d,"PAPER_A4SMALL", SWIG_FromInt((int)wxPAPER_A4SMALL)); + PyDict_SetItemString(d,"PAPER_A5", SWIG_FromInt((int)wxPAPER_A5)); + PyDict_SetItemString(d,"PAPER_B4", SWIG_FromInt((int)wxPAPER_B4)); + PyDict_SetItemString(d,"PAPER_B5", SWIG_FromInt((int)wxPAPER_B5)); + PyDict_SetItemString(d,"PAPER_FOLIO", SWIG_FromInt((int)wxPAPER_FOLIO)); + PyDict_SetItemString(d,"PAPER_QUARTO", SWIG_FromInt((int)wxPAPER_QUARTO)); + PyDict_SetItemString(d,"PAPER_10X14", SWIG_FromInt((int)wxPAPER_10X14)); + PyDict_SetItemString(d,"PAPER_11X17", SWIG_FromInt((int)wxPAPER_11X17)); + PyDict_SetItemString(d,"PAPER_NOTE", SWIG_FromInt((int)wxPAPER_NOTE)); + PyDict_SetItemString(d,"PAPER_ENV_9", SWIG_FromInt((int)wxPAPER_ENV_9)); + PyDict_SetItemString(d,"PAPER_ENV_10", SWIG_FromInt((int)wxPAPER_ENV_10)); + PyDict_SetItemString(d,"PAPER_ENV_11", SWIG_FromInt((int)wxPAPER_ENV_11)); + PyDict_SetItemString(d,"PAPER_ENV_12", SWIG_FromInt((int)wxPAPER_ENV_12)); + PyDict_SetItemString(d,"PAPER_ENV_14", SWIG_FromInt((int)wxPAPER_ENV_14)); + PyDict_SetItemString(d,"PAPER_ENV_DL", SWIG_FromInt((int)wxPAPER_ENV_DL)); + PyDict_SetItemString(d,"PAPER_ENV_C5", SWIG_FromInt((int)wxPAPER_ENV_C5)); + PyDict_SetItemString(d,"PAPER_ENV_C3", SWIG_FromInt((int)wxPAPER_ENV_C3)); + PyDict_SetItemString(d,"PAPER_ENV_C4", SWIG_FromInt((int)wxPAPER_ENV_C4)); + PyDict_SetItemString(d,"PAPER_ENV_C6", SWIG_FromInt((int)wxPAPER_ENV_C6)); + PyDict_SetItemString(d,"PAPER_ENV_C65", SWIG_FromInt((int)wxPAPER_ENV_C65)); + PyDict_SetItemString(d,"PAPER_ENV_B4", SWIG_FromInt((int)wxPAPER_ENV_B4)); + PyDict_SetItemString(d,"PAPER_ENV_B5", SWIG_FromInt((int)wxPAPER_ENV_B5)); + PyDict_SetItemString(d,"PAPER_ENV_B6", SWIG_FromInt((int)wxPAPER_ENV_B6)); + PyDict_SetItemString(d,"PAPER_ENV_ITALY", SWIG_FromInt((int)wxPAPER_ENV_ITALY)); + PyDict_SetItemString(d,"PAPER_ENV_MONARCH", SWIG_FromInt((int)wxPAPER_ENV_MONARCH)); + PyDict_SetItemString(d,"PAPER_ENV_PERSONAL", SWIG_FromInt((int)wxPAPER_ENV_PERSONAL)); + PyDict_SetItemString(d,"PAPER_FANFOLD_US", SWIG_FromInt((int)wxPAPER_FANFOLD_US)); + PyDict_SetItemString(d,"PAPER_FANFOLD_STD_GERMAN", SWIG_FromInt((int)wxPAPER_FANFOLD_STD_GERMAN)); + PyDict_SetItemString(d,"PAPER_FANFOLD_LGL_GERMAN", SWIG_FromInt((int)wxPAPER_FANFOLD_LGL_GERMAN)); + PyDict_SetItemString(d,"PAPER_ISO_B4", SWIG_FromInt((int)wxPAPER_ISO_B4)); + PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD", SWIG_FromInt((int)wxPAPER_JAPANESE_POSTCARD)); + PyDict_SetItemString(d,"PAPER_9X11", SWIG_FromInt((int)wxPAPER_9X11)); + PyDict_SetItemString(d,"PAPER_10X11", SWIG_FromInt((int)wxPAPER_10X11)); + PyDict_SetItemString(d,"PAPER_15X11", SWIG_FromInt((int)wxPAPER_15X11)); + PyDict_SetItemString(d,"PAPER_ENV_INVITE", SWIG_FromInt((int)wxPAPER_ENV_INVITE)); + PyDict_SetItemString(d,"PAPER_LETTER_EXTRA", SWIG_FromInt((int)wxPAPER_LETTER_EXTRA)); + PyDict_SetItemString(d,"PAPER_LEGAL_EXTRA", SWIG_FromInt((int)wxPAPER_LEGAL_EXTRA)); + PyDict_SetItemString(d,"PAPER_TABLOID_EXTRA", SWIG_FromInt((int)wxPAPER_TABLOID_EXTRA)); + PyDict_SetItemString(d,"PAPER_A4_EXTRA", SWIG_FromInt((int)wxPAPER_A4_EXTRA)); + PyDict_SetItemString(d,"PAPER_LETTER_TRANSVERSE", SWIG_FromInt((int)wxPAPER_LETTER_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A4_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A4_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_LETTER_EXTRA_TRANSVERSE", SWIG_FromInt((int)wxPAPER_LETTER_EXTRA_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A_PLUS", SWIG_FromInt((int)wxPAPER_A_PLUS)); + PyDict_SetItemString(d,"PAPER_B_PLUS", SWIG_FromInt((int)wxPAPER_B_PLUS)); + PyDict_SetItemString(d,"PAPER_LETTER_PLUS", SWIG_FromInt((int)wxPAPER_LETTER_PLUS)); + PyDict_SetItemString(d,"PAPER_A4_PLUS", SWIG_FromInt((int)wxPAPER_A4_PLUS)); + PyDict_SetItemString(d,"PAPER_A5_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A5_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_B5_TRANSVERSE", SWIG_FromInt((int)wxPAPER_B5_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A3_EXTRA", SWIG_FromInt((int)wxPAPER_A3_EXTRA)); + PyDict_SetItemString(d,"PAPER_A5_EXTRA", SWIG_FromInt((int)wxPAPER_A5_EXTRA)); + PyDict_SetItemString(d,"PAPER_B5_EXTRA", SWIG_FromInt((int)wxPAPER_B5_EXTRA)); + PyDict_SetItemString(d,"PAPER_A2", SWIG_FromInt((int)wxPAPER_A2)); + PyDict_SetItemString(d,"PAPER_A3_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A3_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A3_EXTRA_TRANSVERSE)); + PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_FromInt((int)wxDUPLEX_SIMPLEX)); + PyDict_SetItemString(d,"DUPLEX_HORIZONTAL", SWIG_FromInt((int)wxDUPLEX_HORIZONTAL)); + PyDict_SetItemString(d,"DUPLEX_VERTICAL", SWIG_FromInt((int)wxDUPLEX_VERTICAL)); + PyDict_SetItemString(d,"ITEM_SEPARATOR", SWIG_FromInt((int)wxITEM_SEPARATOR)); + PyDict_SetItemString(d,"ITEM_NORMAL", SWIG_FromInt((int)wxITEM_NORMAL)); + PyDict_SetItemString(d,"ITEM_CHECK", SWIG_FromInt((int)wxITEM_CHECK)); + PyDict_SetItemString(d,"ITEM_RADIO", SWIG_FromInt((int)wxITEM_RADIO)); + PyDict_SetItemString(d,"ITEM_MAX", SWIG_FromInt((int)wxITEM_MAX)); + PyDict_SetItemString(d,"HT_NOWHERE", SWIG_FromInt((int)wxHT_NOWHERE)); + PyDict_SetItemString(d,"HT_SCROLLBAR_FIRST", SWIG_FromInt((int)wxHT_SCROLLBAR_FIRST)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_1", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_2", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_1", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_2", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_THUMB", SWIG_FromInt((int)wxHT_SCROLLBAR_THUMB)); + PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_1", SWIG_FromInt((int)wxHT_SCROLLBAR_BAR_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_2", SWIG_FromInt((int)wxHT_SCROLLBAR_BAR_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_LAST", SWIG_FromInt((int)wxHT_SCROLLBAR_LAST)); + PyDict_SetItemString(d,"HT_WINDOW_OUTSIDE", SWIG_FromInt((int)wxHT_WINDOW_OUTSIDE)); + PyDict_SetItemString(d,"HT_WINDOW_INSIDE", SWIG_FromInt((int)wxHT_WINDOW_INSIDE)); + PyDict_SetItemString(d,"HT_WINDOW_VERT_SCROLLBAR", SWIG_FromInt((int)wxHT_WINDOW_VERT_SCROLLBAR)); + PyDict_SetItemString(d,"HT_WINDOW_HORZ_SCROLLBAR", SWIG_FromInt((int)wxHT_WINDOW_HORZ_SCROLLBAR)); + PyDict_SetItemString(d,"HT_WINDOW_CORNER", SWIG_FromInt((int)wxHT_WINDOW_CORNER)); + PyDict_SetItemString(d,"HT_MAX", SWIG_FromInt((int)wxHT_MAX)); + PyDict_SetItemString(d,"MOD_NONE", SWIG_FromInt((int)wxMOD_NONE)); + PyDict_SetItemString(d,"MOD_ALT", SWIG_FromInt((int)wxMOD_ALT)); + PyDict_SetItemString(d,"MOD_CONTROL", SWIG_FromInt((int)wxMOD_CONTROL)); + PyDict_SetItemString(d,"MOD_SHIFT", SWIG_FromInt((int)wxMOD_SHIFT)); + PyDict_SetItemString(d,"MOD_WIN", SWIG_FromInt((int)wxMOD_WIN)); + PyDict_SetItemString(d,"UPDATE_UI_NONE", SWIG_FromInt((int)wxUPDATE_UI_NONE)); + PyDict_SetItemString(d,"UPDATE_UI_RECURSE", SWIG_FromInt((int)wxUPDATE_UI_RECURSE)); + PyDict_SetItemString(d,"UPDATE_UI_FROMIDLE", SWIG_FromInt((int)wxUPDATE_UI_FROMIDLE)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); + SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set); + PyDict_SetItemString(d,"BITMAP_TYPE_INVALID", SWIG_FromInt((int)wxBITMAP_TYPE_INVALID)); + PyDict_SetItemString(d,"BITMAP_TYPE_BMP", SWIG_FromInt((int)wxBITMAP_TYPE_BMP)); + PyDict_SetItemString(d,"BITMAP_TYPE_ICO", SWIG_FromInt((int)wxBITMAP_TYPE_ICO)); + PyDict_SetItemString(d,"BITMAP_TYPE_CUR", SWIG_FromInt((int)wxBITMAP_TYPE_CUR)); + PyDict_SetItemString(d,"BITMAP_TYPE_XBM", SWIG_FromInt((int)wxBITMAP_TYPE_XBM)); + PyDict_SetItemString(d,"BITMAP_TYPE_XBM_DATA", SWIG_FromInt((int)wxBITMAP_TYPE_XBM_DATA)); + PyDict_SetItemString(d,"BITMAP_TYPE_XPM", SWIG_FromInt((int)wxBITMAP_TYPE_XPM)); + PyDict_SetItemString(d,"BITMAP_TYPE_XPM_DATA", SWIG_FromInt((int)wxBITMAP_TYPE_XPM_DATA)); + PyDict_SetItemString(d,"BITMAP_TYPE_TIF", SWIG_FromInt((int)wxBITMAP_TYPE_TIF)); + PyDict_SetItemString(d,"BITMAP_TYPE_GIF", SWIG_FromInt((int)wxBITMAP_TYPE_GIF)); + PyDict_SetItemString(d,"BITMAP_TYPE_PNG", SWIG_FromInt((int)wxBITMAP_TYPE_PNG)); + PyDict_SetItemString(d,"BITMAP_TYPE_JPEG", SWIG_FromInt((int)wxBITMAP_TYPE_JPEG)); + PyDict_SetItemString(d,"BITMAP_TYPE_PNM", SWIG_FromInt((int)wxBITMAP_TYPE_PNM)); + PyDict_SetItemString(d,"BITMAP_TYPE_PCX", SWIG_FromInt((int)wxBITMAP_TYPE_PCX)); + PyDict_SetItemString(d,"BITMAP_TYPE_PICT", SWIG_FromInt((int)wxBITMAP_TYPE_PICT)); + PyDict_SetItemString(d,"BITMAP_TYPE_ICON", SWIG_FromInt((int)wxBITMAP_TYPE_ICON)); + PyDict_SetItemString(d,"BITMAP_TYPE_ANI", SWIG_FromInt((int)wxBITMAP_TYPE_ANI)); + PyDict_SetItemString(d,"BITMAP_TYPE_IFF", SWIG_FromInt((int)wxBITMAP_TYPE_IFF)); + PyDict_SetItemString(d,"BITMAP_TYPE_MACCURSOR", SWIG_FromInt((int)wxBITMAP_TYPE_MACCURSOR)); + PyDict_SetItemString(d,"BITMAP_TYPE_ANY", SWIG_FromInt((int)wxBITMAP_TYPE_ANY)); + PyDict_SetItemString(d,"CURSOR_NONE", SWIG_FromInt((int)wxCURSOR_NONE)); + PyDict_SetItemString(d,"CURSOR_ARROW", SWIG_FromInt((int)wxCURSOR_ARROW)); + PyDict_SetItemString(d,"CURSOR_RIGHT_ARROW", SWIG_FromInt((int)wxCURSOR_RIGHT_ARROW)); + PyDict_SetItemString(d,"CURSOR_BULLSEYE", SWIG_FromInt((int)wxCURSOR_BULLSEYE)); + PyDict_SetItemString(d,"CURSOR_CHAR", SWIG_FromInt((int)wxCURSOR_CHAR)); + PyDict_SetItemString(d,"CURSOR_CROSS", SWIG_FromInt((int)wxCURSOR_CROSS)); + PyDict_SetItemString(d,"CURSOR_HAND", SWIG_FromInt((int)wxCURSOR_HAND)); + PyDict_SetItemString(d,"CURSOR_IBEAM", SWIG_FromInt((int)wxCURSOR_IBEAM)); + PyDict_SetItemString(d,"CURSOR_LEFT_BUTTON", SWIG_FromInt((int)wxCURSOR_LEFT_BUTTON)); + PyDict_SetItemString(d,"CURSOR_MAGNIFIER", SWIG_FromInt((int)wxCURSOR_MAGNIFIER)); + PyDict_SetItemString(d,"CURSOR_MIDDLE_BUTTON", SWIG_FromInt((int)wxCURSOR_MIDDLE_BUTTON)); + PyDict_SetItemString(d,"CURSOR_NO_ENTRY", SWIG_FromInt((int)wxCURSOR_NO_ENTRY)); + PyDict_SetItemString(d,"CURSOR_PAINT_BRUSH", SWIG_FromInt((int)wxCURSOR_PAINT_BRUSH)); + PyDict_SetItemString(d,"CURSOR_PENCIL", SWIG_FromInt((int)wxCURSOR_PENCIL)); + PyDict_SetItemString(d,"CURSOR_POINT_LEFT", SWIG_FromInt((int)wxCURSOR_POINT_LEFT)); + PyDict_SetItemString(d,"CURSOR_POINT_RIGHT", SWIG_FromInt((int)wxCURSOR_POINT_RIGHT)); + PyDict_SetItemString(d,"CURSOR_QUESTION_ARROW", SWIG_FromInt((int)wxCURSOR_QUESTION_ARROW)); + PyDict_SetItemString(d,"CURSOR_RIGHT_BUTTON", SWIG_FromInt((int)wxCURSOR_RIGHT_BUTTON)); + PyDict_SetItemString(d,"CURSOR_SIZENESW", SWIG_FromInt((int)wxCURSOR_SIZENESW)); + PyDict_SetItemString(d,"CURSOR_SIZENS", SWIG_FromInt((int)wxCURSOR_SIZENS)); + PyDict_SetItemString(d,"CURSOR_SIZENWSE", SWIG_FromInt((int)wxCURSOR_SIZENWSE)); + PyDict_SetItemString(d,"CURSOR_SIZEWE", SWIG_FromInt((int)wxCURSOR_SIZEWE)); + PyDict_SetItemString(d,"CURSOR_SIZING", SWIG_FromInt((int)wxCURSOR_SIZING)); + PyDict_SetItemString(d,"CURSOR_SPRAYCAN", SWIG_FromInt((int)wxCURSOR_SPRAYCAN)); + PyDict_SetItemString(d,"CURSOR_WAIT", SWIG_FromInt((int)wxCURSOR_WAIT)); + PyDict_SetItemString(d,"CURSOR_WATCH", SWIG_FromInt((int)wxCURSOR_WATCH)); + PyDict_SetItemString(d,"CURSOR_BLANK", SWIG_FromInt((int)wxCURSOR_BLANK)); + PyDict_SetItemString(d,"CURSOR_DEFAULT", SWIG_FromInt((int)wxCURSOR_DEFAULT)); + PyDict_SetItemString(d,"CURSOR_COPY_ARROW", SWIG_FromInt((int)wxCURSOR_COPY_ARROW)); + PyDict_SetItemString(d,"CURSOR_ARROWWAIT", SWIG_FromInt((int)wxCURSOR_ARROWWAIT)); + PyDict_SetItemString(d,"CURSOR_MAX", SWIG_FromInt((int)wxCURSOR_MAX)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set); + PyDict_SetItemString(d,"FromStart", SWIG_FromInt((int)wxFromStart)); + PyDict_SetItemString(d,"FromCurrent", SWIG_FromInt((int)wxFromCurrent)); + PyDict_SetItemString(d,"FromEnd", SWIG_FromInt((int)wxFromEnd)); wxPyPtrTypeMap_Add("wxInputStream", "wxPyInputStream"); @@ -38147,6 +42321,19 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_CUR_HOTSPOT_Y",_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get, _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTION",_wrap_IMAGE_OPTION_RESOLUTION_get, _wrap_IMAGE_OPTION_RESOLUTION_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONUNIT",_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get, _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set); + PyDict_SetItemString(d,"IMAGE_RESOLUTION_INCHES", SWIG_FromInt((int)wxIMAGE_RESOLUTION_INCHES)); + PyDict_SetItemString(d,"IMAGE_RESOLUTION_CM", SWIG_FromInt((int)wxIMAGE_RESOLUTION_CM)); + PyDict_SetItemString(d,"BMP_24BPP", SWIG_FromInt((int)wxBMP_24BPP)); + PyDict_SetItemString(d,"BMP_8BPP", SWIG_FromInt((int)wxBMP_8BPP)); + PyDict_SetItemString(d,"BMP_8BPP_GREY", SWIG_FromInt((int)wxBMP_8BPP_GREY)); + PyDict_SetItemString(d,"BMP_8BPP_GRAY", SWIG_FromInt((int)wxBMP_8BPP_GRAY)); + PyDict_SetItemString(d,"BMP_8BPP_RED", SWIG_FromInt((int)wxBMP_8BPP_RED)); + PyDict_SetItemString(d,"BMP_8BPP_PALETTE", SWIG_FromInt((int)wxBMP_8BPP_PALETTE)); + PyDict_SetItemString(d,"BMP_4BPP", SWIG_FromInt((int)wxBMP_4BPP)); + PyDict_SetItemString(d,"BMP_1BPP", SWIG_FromInt((int)wxBMP_1BPP)); + PyDict_SetItemString(d,"BMP_1BPP_BW", SWIG_FromInt((int)wxBMP_1BPP_BW)); + PyDict_SetItemString(d,"EVENT_PROPAGATE_NONE", SWIG_FromInt((int)wxEVENT_PROPAGATE_NONE)); + PyDict_SetItemString(d,"EVENT_PROPAGATE_MAX", SWIG_FromInt((int)wxEVENT_PROPAGATE_MAX)); PyDict_SetItemString(d, "wxEVT_NULL", PyInt_FromLong(wxEVT_NULL)); PyDict_SetItemString(d, "wxEVT_FIRST", PyInt_FromLong(wxEVT_FIRST)); PyDict_SetItemString(d, "wxEVT_USER_FIRST", PyInt_FromLong(wxEVT_USER_FIRST)); @@ -38261,8 +42448,53 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong(wxEVT_COMMAND_SET_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER)); + PyDict_SetItemString(d,"MOUSE_BTN_ANY", SWIG_FromInt((int)wxMOUSE_BTN_ANY)); + PyDict_SetItemString(d,"MOUSE_BTN_NONE", SWIG_FromInt((int)wxMOUSE_BTN_NONE)); + PyDict_SetItemString(d,"MOUSE_BTN_LEFT", SWIG_FromInt((int)wxMOUSE_BTN_LEFT)); + PyDict_SetItemString(d,"MOUSE_BTN_MIDDLE", SWIG_FromInt((int)wxMOUSE_BTN_MIDDLE)); + PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT)); + PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); + PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL)); + PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_FromInt((int)wxIDLE_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_FromInt((int)wxPYAPP_ASSERT_SUPPRESS)); + PyDict_SetItemString(d,"PYAPP_ASSERT_EXCEPTION", SWIG_FromInt((int)wxPYAPP_ASSERT_EXCEPTION)); + PyDict_SetItemString(d,"PYAPP_ASSERT_DIALOG", SWIG_FromInt((int)wxPYAPP_ASSERT_DIALOG)); + PyDict_SetItemString(d,"PYAPP_ASSERT_LOG", SWIG_FromInt((int)wxPYAPP_ASSERT_LOG)); + PyDict_SetItemString(d,"PRINT_WINDOWS", SWIG_FromInt((int)wxPRINT_WINDOWS)); + PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_FromInt((int)wxPRINT_POSTSCRIPT)); + SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); + SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set); + PyDict_SetItemString(d,"WINDOW_VARIANT_DEFAULT", SWIG_FromInt((int)wxWINDOW_VARIANT_DEFAULT)); + PyDict_SetItemString(d,"WINDOW_VARIANT_NORMAL", SWIG_FromInt((int)wxWINDOW_VARIANT_NORMAL)); + PyDict_SetItemString(d,"WINDOW_VARIANT_SMALL", SWIG_FromInt((int)wxWINDOW_VARIANT_SMALL)); + PyDict_SetItemString(d,"WINDOW_VARIANT_MINI", SWIG_FromInt((int)wxWINDOW_VARIANT_MINI)); + PyDict_SetItemString(d,"WINDOW_VARIANT_LARGE", SWIG_FromInt((int)wxWINDOW_VARIANT_LARGE)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set); + SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set); + PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_FromInt((int)wxFLEX_GROWMODE_NONE)); + PyDict_SetItemString(d,"FLEX_GROWMODE_SPECIFIED", SWIG_FromInt((int)wxFLEX_GROWMODE_SPECIFIED)); + PyDict_SetItemString(d,"FLEX_GROWMODE_ALL", SWIG_FromInt((int)wxFLEX_GROWMODE_ALL)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set); + PyDict_SetItemString(d,"Left", SWIG_FromInt((int)wxLeft)); + PyDict_SetItemString(d,"Top", SWIG_FromInt((int)wxTop)); + PyDict_SetItemString(d,"Right", SWIG_FromInt((int)wxRight)); + PyDict_SetItemString(d,"Bottom", SWIG_FromInt((int)wxBottom)); + PyDict_SetItemString(d,"Width", SWIG_FromInt((int)wxWidth)); + PyDict_SetItemString(d,"Height", SWIG_FromInt((int)wxHeight)); + PyDict_SetItemString(d,"Centre", SWIG_FromInt((int)wxCentre)); + PyDict_SetItemString(d,"Center", SWIG_FromInt((int)wxCenter)); + PyDict_SetItemString(d,"CentreX", SWIG_FromInt((int)wxCentreX)); + PyDict_SetItemString(d,"CentreY", SWIG_FromInt((int)wxCentreY)); + PyDict_SetItemString(d,"Unconstrained", SWIG_FromInt((int)wxUnconstrained)); + PyDict_SetItemString(d,"AsIs", SWIG_FromInt((int)wxAsIs)); + PyDict_SetItemString(d,"PercentOf", SWIG_FromInt((int)wxPercentOf)); + PyDict_SetItemString(d,"Above", SWIG_FromInt((int)wxAbove)); + PyDict_SetItemString(d,"Below", SWIG_FromInt((int)wxBelow)); + PyDict_SetItemString(d,"LeftOf", SWIG_FromInt((int)wxLeftOf)); + PyDict_SetItemString(d,"RightOf", SWIG_FromInt((int)wxRightOf)); + PyDict_SetItemString(d,"SameAs", SWIG_FromInt((int)wxSameAs)); + PyDict_SetItemString(d,"Absolute", SWIG_FromInt((int)wxAbsolute)); // Initialize threading, some globals and such __wxPyPreStart(d);