X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f774befd17081958952ec0e8dd3a818a4407947..689b5c386913f0286214717666aa5ba3dc14b0bc:/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp index f154802cdd..444d6ed1e4 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp @@ -45,8 +45,9 @@ 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 +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData + /*********************************************************************** * common.swg for wxPython @@ -233,9 +234,9 @@ static swig_type_info *swig_types[9]; #include - static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas")); - static const wxString wxPyEmptyString(wxT("")); + static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas")); + static const wxString wxPyEmptyString(wxEmptyString); 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); @@ -243,6 +244,26 @@ wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette #ifdef __cplusplus extern "C" { #endif +static int _wrap_GLCanvasNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable GLCanvasNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_GLCanvasNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyGLCanvasNameStr)->c_str(), (&wxPyGLCanvasNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyGLCanvasNameStr)->c_str(), (&wxPyGLCanvasNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; bool arg1 ; @@ -1105,6 +1126,8 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); + SWIG_addvarlink(SWIG_globals,(char*)"GLCanvasNameStr",_wrap_GLCanvasNameStr_get, _wrap_GLCanvasNameStr_set);