X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02a34c4c56065ff2802c1deef9dd02919c565fda..976f924083419b6a7feb1ff7d597c746a70abf1a:/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp?ds=sidebyside diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp index 6d8e496823..8f4d5981d4 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp @@ -43,6 +43,7 @@ private: #define SWIG_TypeCast SWIG_Python_TypeCast #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast #define SWIG_TypeName SWIG_Python_TypeName +#define SWIG_TypePrettyName SWIG_Python_TypePrettyName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData #define SWIG_PackData SWIG_Python_PackData @@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); +SWIGIMPORT(const char *) SWIG_TypePrettyName(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); @@ -134,8 +136,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); * ************************************************************************/ -#include "Python.h" - #ifdef __cplusplus extern "C" { #endif @@ -195,28 +195,6 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -/* ----------------------------------------------------------------------------- - * the needed conversions between C++ and python - * ----------------------------------------------------------------------------- */ -/* basic types */ -/* - utilities -*/ -SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); -SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); -SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); -SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, - long min_value, long max_value); -SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, - unsigned long max_value); -SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); -SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, - char** cptr, size_t* size); -SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, - char* carray, size_t size); -SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); -SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); - /* Contract support */ @@ -250,42 +228,64 @@ static swig_type_info *swig_types[9]; #define SWIG_name "_glcanvas" -#include -#include -#include +/* Auxiliar swig macros that appear in the header */ -#ifndef SWIGSTATIC -#ifdef __cplusplus -#define SWIGSTATIC(a) static inline a -#else -#define SWIGSTATIC(a) static a -#endif -#endif +#define SWIG_OLDOBJ 1 +#define SWIG_NEWOBJ SWIG_OLDOBJ + 1 +#define SWIG_PYSTR SWIG_NEWOBJ + 1 -#ifndef numeric_cast #ifdef __cplusplus -#ifdef HAVE_NUMERIC_CAST -#define numeric_cast(type,a) numeric_cast(a) -#else -#define numeric_cast(type,a) static_cast(a) -#endif -#else -#define numeric_cast(type,a) (type)(a) -#endif -#endif - - - -#define SWIG_PyObj_FromSignedChar PyInt_FromLong -#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong -#define SWIG_PyObj_FromShort PyInt_FromLong -#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong -#define SWIG_PyObj_FromInt PyInt_FromLong -#define SWIG_PyObj_FromLong PyInt_FromLong -#define SWIG_PyObj_FromFloat PyFloat_FromDouble -#define SWIG_PyObj_FromDouble PyFloat_FromDouble -#define SWIG_PyObj_FromFloat PyFloat_FromDouble -#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIGSTATICINLINE(a) static inline a +#define SWIGSTATIC(a) static a +#define swig_new_array(size,Type) (new Type[(size)]) +#define swig_delete(cptr) delete cptr +#define swig_delete_array(cptr) delete[] cptr +#define swig_const_cast(a,Type) const_cast(a) +#define swig_static_cast(a,Type) static_cast(a) +#define swig_reinterpret_cast(a,Type) reinterpret_cast(a) +#define swig_new_copy(ptr,Type) (new Type(*ptr)) +#define swig_numeric_cast(a,Type) static_cast(a) + +#else /* C case */ + +#define SWIGSTATICINLINE(a) static a +#define SWIGSTATIC(a) static a +#define swig_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type))) +#define swig_delete(cptr) free((char*)cptr) +#define swig_delete_array(cptr) free((char*)cptr) +#define swig_const_cast(a,Type) (Type)(a) +#define swig_static_cast(a,Type) (Type)(a) +#define swig_reinterpret_cast(a,Type) (Type)(a) +#define swig_numeric_cast(a,Type) (Type)(a) +#define swig_new_copy(ptr,Type) ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type))) + +#endif /* __cplusplus */ + + +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_signed_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_int PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_long PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_float PyFloat_FromDouble +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_double PyFloat_FromDouble +/*@@*/ #include "wx/wxPython/wxPython.h" @@ -297,10 +297,124 @@ static swig_type_info *swig_types[9]; static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas")); static const wxString wxPyEmptyString(wxEmptyString); -SWIGSTATIC(bool) -SWIG_PyObj_AsBool(PyObject *obj) +#include + + +SWIGSTATICINLINE(int) + SWIG_CheckLongInRange(long value, long min_value, long max_value, + const char *errmsg) +{ + if (value < min_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %ld is less than '%s' minimum %ld", + value, errmsg, min_value); + } + return 0; + } else if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %ld is greater than '%s' maximum %ld", + value, errmsg, max_value); + } + return 0; + } + return 1; +} + + +// See my_fragments.i +SWIGSTATICINLINE(int) +SWIG_AsVal_long(PyObject* obj, long* val) +{ + if (PyNumber_Check(obj)) { + if (val) *val = PyInt_AsLong(obj); + return 1; + } + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + } + return 0; +} + + +#if INT_MAX != LONG_MAX +SWIGSTATICINLINE(int) + SWIG_AsVal_int(PyObject *obj, int *val) +{ + const char* errmsg = val ? "int" : 0; + long v; + if (SWIG_AsVal_long(obj, &v)) { + if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) { + if (val) *val = swig_numeric_cast(v, int); + return 1; + } else { + return 0; + } + } else { + PyErr_Clear(); + } + if (val) { + PyErr_SetString(PyExc_TypeError, "an int is expected"); + } + return 0; +} +#else +SWIGSTATICINLINE(int) + SWIG_AsVal_int(PyObject *obj, int *val) +{ + return SWIG_AsVal_long(obj,(long*)val); +} +#endif + + +SWIGSTATICINLINE(int) + SWIG_AsVal_bool(PyObject *obj, bool *val) { - return PyObject_IsTrue(obj) ? true : false; + /* if (val) *val = PyObject_IsTrue(obj); return 1; */ + if (obj == Py_True) { + if (val) *val = true; + return 1; + } + if (obj == Py_False) { + if (val) *val = false; + return 1; + } + int res = 0; + if (SWIG_AsVal_int(obj, &res)) { + if (val) *val = (bool)res; + return 1; + } + if (val) { + PyErr_SetString(PyExc_TypeError, "a bool is expected"); + } + return 0; +} + + +SWIGSTATICINLINE(bool) +SWIG_As_bool(PyObject* obj) +{ + bool v; + if (!SWIG_AsVal_bool(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(bool)); + } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_bool(PyObject* obj) +{ + return SWIG_AsVal_bool(obj, (bool*)0); } wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette,wxGLContext const *other){ @@ -308,18 +422,49 @@ wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette return new wxGLContext(fmt, win, palette, other); } -SWIGSTATIC(int) -SWIG_PyObj_AsInt(PyObject *obj) -{ - return numeric_cast(int, - SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +SWIGSTATICINLINE(int) +SWIG_As_int(PyObject* obj) +{ + int v; + if (!SWIG_AsVal_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(int)); + } + return v; } -SWIGSTATIC(long) -SWIG_PyObj_AsLong(PyObject * obj) +SWIGSTATICINLINE(long) +SWIG_As_long(PyObject* obj) +{ + long v; + if (!SWIG_AsVal_long(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(long)); + } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_int(PyObject* obj) { - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); + return SWIG_AsVal_int(obj, (int*)0); +} + + +SWIGSTATICINLINE(int) +SWIG_Check_long(PyObject* obj) +{ + return SWIG_AsVal_long(obj, (long*)0); } #ifdef __cplusplus @@ -345,7 +490,7 @@ static PyObject *_wrap_GLCanvasNameStr_get() { } -static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_GLContext(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; bool arg1 ; wxGLCanvas *arg2 = (wxGLCanvas *) 0 ; @@ -362,35 +507,39 @@ static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GLContext",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - { - arg1 = (bool) SWIG_PyObj_AsBool(obj0); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg1 = (bool)SWIG_As_bool(obj0); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGLCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPalette, + 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; } } if (obj3) { - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxGLContext, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGLContext *)new_wxGLContext(arg1,arg2,(wxPalette const &)*arg3,(wxGLContext const *)arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGLContext, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGLContext, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_GLContext(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_delete_GLContext(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLContext *arg1 = (wxGLContext *) 0 ; PyObject * obj0 = 0 ; @@ -399,7 +548,8 @@ static PyObject *_wrap_delete_GLContext(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GLContext",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLContext, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -414,7 +564,7 @@ static PyObject *_wrap_delete_GLContext(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_GLContext_SetCurrent(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLContext_SetCurrent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLContext *arg1 = (wxGLContext *) 0 ; PyObject * obj0 = 0 ; @@ -423,7 +573,8 @@ static PyObject *_wrap_GLContext_SetCurrent(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GLContext_SetCurrent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLContext, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCurrent(); @@ -438,7 +589,7 @@ static PyObject *_wrap_GLContext_SetCurrent(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_GLContext_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLContext_SetColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLContext *arg1 = (wxGLContext *) 0 ; wxString *arg2 = 0 ; @@ -450,7 +601,8 @@ static PyObject *_wrap_GLContext_SetColour(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GLContext_SetColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLContext, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -478,7 +630,7 @@ static PyObject *_wrap_GLContext_SetColour(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_GLContext_SwapBuffers(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLContext_SwapBuffers(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLContext *arg1 = (wxGLContext *) 0 ; PyObject * obj0 = 0 ; @@ -487,7 +639,8 @@ static PyObject *_wrap_GLContext_SwapBuffers(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GLContext_SwapBuffers",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLContext, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SwapBuffers(); @@ -502,7 +655,7 @@ static PyObject *_wrap_GLContext_SwapBuffers(PyObject *self, PyObject *args, PyO } -static PyObject *_wrap_GLContext_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLContext_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLContext *arg1 = (wxGLContext *) 0 ; wxWindow *result; @@ -512,7 +665,8 @@ static PyObject *_wrap_GLContext_GetWindow(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GLContext_GetWindow",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLContext, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->GetWindow(); @@ -521,7 +675,7 @@ static PyObject *_wrap_GLContext_GetWindow(PyObject *self, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -529,14 +683,14 @@ static PyObject *_wrap_GLContext_GetWindow(PyObject *self, PyObject *args, PyObj } -static PyObject * GLContext_swigregister(PyObject *self, PyObject *args) { +static PyObject * GLContext_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; SWIG_TypeClientData(SWIGTYPE_p_wxGLContext, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_GLCanvas(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) -1 ; @@ -568,12 +722,11 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOO:new_GLCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) 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 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { @@ -588,10 +741,8 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw } } if (obj4) { - { - arg5 = (long) SWIG_PyObj_AsLong(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (long)SWIG_As_long(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { { @@ -615,19 +766,23 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw } } if (obj7) { - if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj7,(void **)(&arg8),SWIGTYPE_p_wxPalette, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg8 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } } { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGLCanvas *)new wxGLCanvas(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6,arg7,(wxPalette const &)*arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGLCanvas, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGLCanvas, 1); { if (temp6) delete arg6; @@ -648,7 +803,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_GLCanvasWithContext(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxGLContext *arg2 = (wxGLContext *) NULL ; @@ -682,15 +837,15 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOOO:new_GLCanvasWithContext",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) 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) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGLContext, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int)SWIG_As_int(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { { @@ -705,10 +860,8 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P } } if (obj5) { - { - arg6 = (long) SWIG_PyObj_AsLong(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (long)SWIG_As_long(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { { @@ -732,19 +885,23 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P } } if (obj8) { - if ((SWIG_ConvertPtr(obj8,(void **) &arg9, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj8,(void **)(&arg9),SWIGTYPE_p_wxPalette, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg9 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } } { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGLCanvas *)new wxGLCanvas(arg1,(wxGLContext const *)arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7,arg8,(wxPalette const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGLCanvas, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGLCanvas, 1); { if (temp7) delete arg7; @@ -765,7 +922,7 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P } -static PyObject *_wrap_GLCanvas_SetCurrent(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLCanvas_SetCurrent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLCanvas *arg1 = (wxGLCanvas *) 0 ; PyObject * obj0 = 0 ; @@ -774,7 +931,8 @@ static PyObject *_wrap_GLCanvas_SetCurrent(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GLCanvas_SetCurrent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCurrent(); @@ -789,7 +947,7 @@ static PyObject *_wrap_GLCanvas_SetCurrent(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_GLCanvas_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLCanvas_SetColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLCanvas *arg1 = (wxGLCanvas *) 0 ; wxString *arg2 = 0 ; @@ -801,7 +959,8 @@ static PyObject *_wrap_GLCanvas_SetColour(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GLCanvas_SetColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -829,7 +988,7 @@ static PyObject *_wrap_GLCanvas_SetColour(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_GLCanvas_SwapBuffers(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLCanvas_SwapBuffers(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLCanvas *arg1 = (wxGLCanvas *) 0 ; PyObject * obj0 = 0 ; @@ -838,7 +997,8 @@ static PyObject *_wrap_GLCanvas_SwapBuffers(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GLCanvas_SwapBuffers",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SwapBuffers(); @@ -853,7 +1013,7 @@ static PyObject *_wrap_GLCanvas_SwapBuffers(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_GLCanvas_GetContext(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GLCanvas_GetContext(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGLCanvas *arg1 = (wxGLCanvas *) 0 ; wxGLContext *result; @@ -863,7 +1023,8 @@ static PyObject *_wrap_GLCanvas_GetContext(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GLCanvas_GetContext",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGLCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGLCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGLContext *)(arg1)->GetContext(); @@ -871,14 +1032,14 @@ static PyObject *_wrap_GLCanvas_GetContext(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGLContext, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGLContext, 0); return resultobj; fail: return NULL; } -static PyObject * GLCanvas_swigregister(PyObject *self, PyObject *args) { +static PyObject * GLCanvas_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; SWIG_TypeClientData(SWIGTYPE_p_wxGLCanvas, obj); @@ -886,21 +1047,21 @@ static PyObject * GLCanvas_swigregister(PyObject *self, PyObject *args) { return Py_BuildValue((char *)""); } static PyMethodDef SwigMethods[] = { - { (char *)"new_GLContext", (PyCFunction) _wrap_new_GLContext, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_GLContext", (PyCFunction) _wrap_delete_GLContext, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLContext_SetCurrent", (PyCFunction) _wrap_GLContext_SetCurrent, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLContext_SetColour", (PyCFunction) _wrap_GLContext_SetColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLContext_SwapBuffers", (PyCFunction) _wrap_GLContext_SwapBuffers, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLContext_GetWindow", (PyCFunction) _wrap_GLContext_GetWindow, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLContext_swigregister", GLContext_swigregister, METH_VARARGS }, - { (char *)"new_GLCanvas", (PyCFunction) _wrap_new_GLCanvas, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_GLCanvasWithContext", (PyCFunction) _wrap_new_GLCanvasWithContext, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLCanvas_SetCurrent", (PyCFunction) _wrap_GLCanvas_SetCurrent, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLCanvas_SetColour", (PyCFunction) _wrap_GLCanvas_SetColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLCanvas_SwapBuffers", (PyCFunction) _wrap_GLCanvas_SwapBuffers, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLCanvas_GetContext", (PyCFunction) _wrap_GLCanvas_GetContext, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GLCanvas_swigregister", GLCanvas_swigregister, METH_VARARGS }, - { NULL, NULL } + { (char *)"new_GLContext", (PyCFunction) _wrap_new_GLContext, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"delete_GLContext", (PyCFunction) _wrap_delete_GLContext, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLContext_SetCurrent", (PyCFunction) _wrap_GLContext_SetCurrent, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLContext_SetColour", (PyCFunction) _wrap_GLContext_SetColour, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLContext_SwapBuffers", (PyCFunction) _wrap_GLContext_SwapBuffers, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLContext_GetWindow", (PyCFunction) _wrap_GLContext_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLContext_swigregister", GLContext_swigregister, METH_VARARGS, NULL }, + { (char *)"new_GLCanvas", (PyCFunction) _wrap_new_GLCanvas, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"new_GLCanvasWithContext", (PyCFunction) _wrap_new_GLCanvasWithContext, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLCanvas_SetCurrent", (PyCFunction) _wrap_GLCanvas_SetCurrent, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLCanvas_SetColour", (PyCFunction) _wrap_GLCanvas_SetColour, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLCanvas_SwapBuffers", (PyCFunction) _wrap_GLCanvas_SwapBuffers, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLCanvas_GetContext", (PyCFunction) _wrap_GLCanvas_GetContext, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"GLCanvas_swigregister", GLCanvas_swigregister, METH_VARARGS, NULL }, + { NULL, NULL, 0, NULL } }; @@ -1170,14 +1331,14 @@ static void *_p_wxGLCanvasTo_p_wxEvtHandler(void *x) { static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) ((wxMenu *) x)); } -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},{"_p_wxGLCanvas", _p_wxGLCanvasTo_p_wxWindow},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxGLContext", _p_wxGLContextTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxGLCanvas", _p_wxGLCanvasTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}}; -static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxGLCanvas", _p_wxGLCanvasTo_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_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; -static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0},{"_p_wxPalette"},{0}}; -static swig_type_info _swigt__p_wxGLCanvas[] = {{"_p_wxGLCanvas", 0, "wxGLCanvas *", 0},{"_p_wxGLCanvas"},{0}}; -static swig_type_info _swigt__p_wxGLContext[] = {{"_p_wxGLContext", 0, "wxGLContext *", 0},{"_p_wxGLContext"},{0}}; -static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{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},{"_p_wxGLCanvas", _p_wxGLCanvasTo_p_wxWindow, 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_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_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_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_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_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_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_wxGLContext", _p_wxGLContextTo_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_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_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_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGLCanvas", _p_wxGLCanvasTo_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_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_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_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_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_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_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_wxGLCanvas", _p_wxGLCanvasTo_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_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_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0, 0, 0, 0},{"_p_wxPalette", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGLCanvas[] = {{"_p_wxGLCanvas", 0, "wxGLCanvas *", 0, 0, 0, 0},{"_p_wxGLCanvas", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxGLContext[] = {{"_p_wxGLContext", 0, "wxGLContext *", 0, 0, 0, 0},{"_p_wxGLContext", 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 *swig_types_initial[] = { _swigt__p_wxWindow, @@ -1195,7 +1356,7 @@ _swigt__p_int, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{0}}; +{0, 0, 0, 0.0, 0, 0}}; #ifdef __cplusplus } @@ -1223,22 +1384,22 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"GLCanvasNameStr",_wrap_GLCanvasNameStr_get, _wrap_GLCanvasNameStr_set); - PyDict_SetItemString(d,"WX_GL_RGBA", SWIG_PyObj_FromInt((int)WX_GL_RGBA)); - PyDict_SetItemString(d,"WX_GL_BUFFER_SIZE", SWIG_PyObj_FromInt((int)WX_GL_BUFFER_SIZE)); - PyDict_SetItemString(d,"WX_GL_LEVEL", SWIG_PyObj_FromInt((int)WX_GL_LEVEL)); - PyDict_SetItemString(d,"WX_GL_DOUBLEBUFFER", SWIG_PyObj_FromInt((int)WX_GL_DOUBLEBUFFER)); - PyDict_SetItemString(d,"WX_GL_STEREO", SWIG_PyObj_FromInt((int)WX_GL_STEREO)); - PyDict_SetItemString(d,"WX_GL_AUX_BUFFERS", SWIG_PyObj_FromInt((int)WX_GL_AUX_BUFFERS)); - PyDict_SetItemString(d,"WX_GL_MIN_RED", SWIG_PyObj_FromInt((int)WX_GL_MIN_RED)); - PyDict_SetItemString(d,"WX_GL_MIN_GREEN", SWIG_PyObj_FromInt((int)WX_GL_MIN_GREEN)); - PyDict_SetItemString(d,"WX_GL_MIN_BLUE", SWIG_PyObj_FromInt((int)WX_GL_MIN_BLUE)); - PyDict_SetItemString(d,"WX_GL_MIN_ALPHA", SWIG_PyObj_FromInt((int)WX_GL_MIN_ALPHA)); - PyDict_SetItemString(d,"WX_GL_DEPTH_SIZE", SWIG_PyObj_FromInt((int)WX_GL_DEPTH_SIZE)); - PyDict_SetItemString(d,"WX_GL_STENCIL_SIZE", SWIG_PyObj_FromInt((int)WX_GL_STENCIL_SIZE)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_RED", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_RED)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_GREEN", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_GREEN)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_BLUE", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_BLUE)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_ALPHA)); + PyDict_SetItemString(d,"WX_GL_RGBA", SWIG_From_int((int)WX_GL_RGBA)); + PyDict_SetItemString(d,"WX_GL_BUFFER_SIZE", SWIG_From_int((int)WX_GL_BUFFER_SIZE)); + PyDict_SetItemString(d,"WX_GL_LEVEL", SWIG_From_int((int)WX_GL_LEVEL)); + PyDict_SetItemString(d,"WX_GL_DOUBLEBUFFER", SWIG_From_int((int)WX_GL_DOUBLEBUFFER)); + PyDict_SetItemString(d,"WX_GL_STEREO", SWIG_From_int((int)WX_GL_STEREO)); + PyDict_SetItemString(d,"WX_GL_AUX_BUFFERS", SWIG_From_int((int)WX_GL_AUX_BUFFERS)); + PyDict_SetItemString(d,"WX_GL_MIN_RED", SWIG_From_int((int)WX_GL_MIN_RED)); + PyDict_SetItemString(d,"WX_GL_MIN_GREEN", SWIG_From_int((int)WX_GL_MIN_GREEN)); + PyDict_SetItemString(d,"WX_GL_MIN_BLUE", SWIG_From_int((int)WX_GL_MIN_BLUE)); + PyDict_SetItemString(d,"WX_GL_MIN_ALPHA", SWIG_From_int((int)WX_GL_MIN_ALPHA)); + PyDict_SetItemString(d,"WX_GL_DEPTH_SIZE", SWIG_From_int((int)WX_GL_DEPTH_SIZE)); + PyDict_SetItemString(d,"WX_GL_STENCIL_SIZE", SWIG_From_int((int)WX_GL_STENCIL_SIZE)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_RED", SWIG_From_int((int)WX_GL_MIN_ACCUM_RED)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_GREEN", SWIG_From_int((int)WX_GL_MIN_ACCUM_GREEN)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_BLUE", SWIG_From_int((int)WX_GL_MIN_ACCUM_BLUE)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", SWIG_From_int((int)WX_GL_MIN_ACCUM_ALPHA));