X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f847103a32507f629c581fa900d95e97dfe16df0..b4eecebd423df0c6efe86d7658cd3df818d67ed8:/wxPython/contrib/ogl/ogl.i?ds=sidebyside diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i index 419d5a4361..45e7595d0a 100644 --- a/wxPython/contrib/ogl/ogl.i +++ b/wxPython/contrib/ogl/ogl.i @@ -14,7 +14,8 @@ "The Object Graphics Library provides for simple drawing and manipulation of 2D objects. (This version is deprecated, please use wx.lib.ogl instead.)" %enddef -%module(docstring=DOCSTRING) ogl + +%module(package="wx", docstring=DOCSTRING) ogl %{ #include "wx/wxPython/wxPython.h" @@ -31,15 +32,13 @@ of 2D objects. (This version is deprecated, please use wx.lib.ogl instead.)" %pythoncode { import warnings - warnings.warn("This module is deprecated. Please use the wx.lib.ogl pacakge instead.", + warnings.warn("This module is deprecated. Please use the wx.lib.ogl package instead.", DeprecationWarning, stacklevel=2) } MAKE_CONST_WXSTRING_NOSWIG(EmptyString); -%include _ogl_rename.i - %include _ogldefs.i %include _oglbasic.i %include _oglshapes.i @@ -156,7 +155,10 @@ enum { //--------------------------------------------------------------------------- +MustHaveApp(wxOGLInitialize); void wxOGLInitialize(); + +MustHaveApp(wxOGLCleanUp); void wxOGLCleanUp(); @@ -167,7 +169,7 @@ void wxOGLCleanUp(); // work for any class for the VERY generic cases, but beyond that the helper // needs to know more about the type. wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); wxPyEndBlockThreads(blocked); @@ -200,7 +202,7 @@ wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) { //--------------------------------------------------------------------------- wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); wxPyEndBlockThreads(blocked); @@ -241,7 +243,7 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { //--------------------------------------------------------------------------- -PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { +PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source, bool setThisOwn) { PyObject* target = NULL; if (source && wxIsKindOf(source, wxShapeEvtHandler)) { @@ -256,7 +258,7 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { } } if (! target) { - target = wxPyMake_wxObject2(source, FALSE); + target = wxPyMake_wxObject2(source, setThisOwn, false); if (target != Py_None) ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target)); } @@ -272,7 +274,7 @@ PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) { wxObject* wxObj; wxNode* node = list->GetFirst(); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); @@ -293,11 +295,11 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { wxObject* wxObj; wxNode* node = list->GetFirst(); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); - pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj); + pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj, false); PyList_Append(pyList, pyObj); node = node->GetNext(); }