X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4c0a16186cae6d4a780b59314532fab473fb0b..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 1a4e714f6c..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); @@ -123,6 +125,7 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); } #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -133,8 +136,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); * ************************************************************************/ -#include "Python.h" - #ifdef __cplusplus extern "C" { #endif @@ -204,6 +205,7 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #endif + /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxWindow swig_types[0] @@ -226,47 +228,64 @@ static swig_type_info *swig_types[9]; #define SWIG_name "_glcanvas" -/* Auxiliar swig macros */ +/* Auxiliar swig macros that appear in the header */ + +#define SWIG_OLDOBJ 1 +#define SWIG_NEWOBJ SWIG_OLDOBJ + 1 +#define SWIG_PYSTR SWIG_NEWOBJ + 1 #ifdef __cplusplus #define SWIGSTATICINLINE(a) static inline a #define SWIGSTATIC(a) static a -#define swig_new_array(type, size) (new type[(size)]) +#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(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 +#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(type, size) ((type*) malloc((size)*sizeof(type))) +#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(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) +#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 */ -#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 +/*@/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" @@ -278,100 +297,174 @@ static swig_type_info *swig_types[9]; static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas")); static const wxString wxPyEmptyString(wxEmptyString); -SWIGSTATICINLINE(bool) -SWIG_AsBool(PyObject *obj) +#include + + +SWIGSTATICINLINE(int) + SWIG_CheckLongInRange(long value, long min_value, long max_value, + const char *errmsg) { - return PyObject_IsTrue(obj) ? true : false; + 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_CheckBool(PyObject* obj) +SWIG_AsVal_long(PyObject* obj, long* val) { - SWIG_AsBool(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); + 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 { - return 1; + 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 -wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette,wxGLContext const *other){ - AGLPixelFormat fmt; // TODO: How should this be initialized? - return new wxGLContext(fmt, win, palette, other); - } -#include +SWIGSTATICINLINE(int) + SWIG_AsVal_bool(PyObject *obj, bool *val) +{ + /* 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(long) -SWIG_CheckLongInRange(long value, const char* type, - long min_value, long max_value) +SWIGSTATICINLINE(bool) +SWIG_As_bool(PyObject* obj) { - 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); - } + 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 value; + return v; } - -SWIGSTATICINLINE(long) -SWIG_AsLong(PyObject * obj) + +SWIGSTATICINLINE(int) +SWIG_Check_bool(PyObject* obj) { - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); + return SWIG_AsVal_bool(obj, (bool*)0); } +wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette,wxGLContext const *other){ + AGLPixelFormat fmt; // TODO: How should this be initialized? + return new wxGLContext(fmt, win, palette, other); + } -#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)); +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; } -#else -#define SWIG_AsInt SWIG_AsLong -#endif -SWIGSTATICINLINE(int) -SWIG_CheckInt(PyObject* obj) +SWIGSTATICINLINE(long) +SWIG_As_long(PyObject* obj) { - SWIG_AsInt(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; + 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 SWIG_AsVal_int(obj, (int*)0); +} + SWIGSTATICINLINE(int) -SWIG_CheckLong(PyObject* obj) +SWIG_Check_long(PyObject* obj) { - SWIG_AsLong(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; - } + return SWIG_AsVal_long(obj, (long*)0); } #ifdef __cplusplus @@ -414,7 +507,7 @@ static PyObject *_wrap_new_GLContext(PyObject *, PyObject *args, PyObject *kwarg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GLContext",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - arg1 = (bool) SWIG_AsBool(obj0); + 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; @@ -432,6 +525,7 @@ static PyObject *_wrap_new_GLContext(PyObject *, PyObject *args, PyObject *kwarg 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); @@ -581,7 +675,7 @@ static PyObject *_wrap_GLContext_GetWindow(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -631,7 +725,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *, PyObject *args, PyObject *kwargs if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -647,7 +741,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *, PyObject *args, PyObject *kwargs } } if (obj4) { - arg5 = (long) SWIG_AsLong(obj4); + arg5 = (long)SWIG_As_long(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { @@ -681,6 +775,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *, PyObject *args, PyObject *kwargs } } { + 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); @@ -749,7 +844,7 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *, PyObject *args, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { @@ -765,7 +860,7 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *, PyObject *args, PyObj } } if (obj5) { - arg6 = (long) SWIG_AsLong(obj5); + arg6 = (long)SWIG_As_long(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { @@ -799,6 +894,7 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *, PyObject *args, PyObj } } { + 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); @@ -1288,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_FromInt((int)WX_GL_RGBA)); - PyDict_SetItemString(d,"WX_GL_BUFFER_SIZE", SWIG_FromInt((int)WX_GL_BUFFER_SIZE)); - PyDict_SetItemString(d,"WX_GL_LEVEL", SWIG_FromInt((int)WX_GL_LEVEL)); - PyDict_SetItemString(d,"WX_GL_DOUBLEBUFFER", SWIG_FromInt((int)WX_GL_DOUBLEBUFFER)); - PyDict_SetItemString(d,"WX_GL_STEREO", SWIG_FromInt((int)WX_GL_STEREO)); - PyDict_SetItemString(d,"WX_GL_AUX_BUFFERS", SWIG_FromInt((int)WX_GL_AUX_BUFFERS)); - PyDict_SetItemString(d,"WX_GL_MIN_RED", SWIG_FromInt((int)WX_GL_MIN_RED)); - PyDict_SetItemString(d,"WX_GL_MIN_GREEN", SWIG_FromInt((int)WX_GL_MIN_GREEN)); - PyDict_SetItemString(d,"WX_GL_MIN_BLUE", SWIG_FromInt((int)WX_GL_MIN_BLUE)); - PyDict_SetItemString(d,"WX_GL_MIN_ALPHA", SWIG_FromInt((int)WX_GL_MIN_ALPHA)); - PyDict_SetItemString(d,"WX_GL_DEPTH_SIZE", SWIG_FromInt((int)WX_GL_DEPTH_SIZE)); - PyDict_SetItemString(d,"WX_GL_STENCIL_SIZE", SWIG_FromInt((int)WX_GL_STENCIL_SIZE)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_RED", SWIG_FromInt((int)WX_GL_MIN_ACCUM_RED)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_GREEN", SWIG_FromInt((int)WX_GL_MIN_ACCUM_GREEN)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_BLUE", SWIG_FromInt((int)WX_GL_MIN_ACCUM_BLUE)); - PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", SWIG_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));