X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4e928794167715f19a3021d62b7c4f77611694..ad3fca675f77c2903cafd096bbda8baa2e7689ff:/wxPython/contrib/ogl/ogl.i diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i index 6bc29d196f..fff16bd5a4 100644 --- a/wxPython/contrib/ogl/ogl.i +++ b/wxPython/contrib/ogl/ogl.i @@ -10,34 +10,62 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%define DOCSTRING +"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 ogl +%module(package="wx", docstring=DOCSTRING) ogl %{ -#include "export.h" +#include "wx/wxPython/wxPython.h" +#include "wx/wxPython/pyclasses.h" #include "oglhelpers.h" + %} //--------------------------------------------------------------------------- -%include typemaps.i -%include my_typemaps.i - -%extern wx.i %import windows.i -%extern _defs.i -%extern misc.i -%extern gdi.i +%pythoncode { wx = _core } +%pythoncode { __docfilter__ = wx.__DocFilter(globals()) } + +%pythoncode { + import warnings + warnings.warn("This module is deprecated. Please use the wx.lib.ogl package instead.", + DeprecationWarning, stacklevel=2) +} -%include _ogldefs.i -%import oglbasic.i -%import oglshapes.i -%import oglshapes2.i -%import oglcanvas.i +MAKE_CONST_WXSTRING_NOSWIG(EmptyString); +%include _ogl_rename.i + +%include _ogldefs.i +%include _oglbasic.i +%include _oglshapes.i +%include _oglshapes2.i +%include _oglcanvas.i + +%pythoncode { +%# Aliases +ShapeCanvas = PyShapeCanvas +ShapeEvtHandler = PyShapeEvtHandler +Shape = PyShape +RectangleShape = PyRectangleShape +BitmapShape = PyBitmapShape +DrawnShape = PyDrawnShape +CompositeShape = PyCompositeShape +DividedShape = PyDividedShape +DivisionShape = PyDivisionShape +EllipseShape = PyEllipseShape +CircleShape = PyCircleShape +LineShape = PyLineShape +PolygonShape = PyPolygonShape +TextShape = PyTextShape +ControlPoint = PyControlPoint +} -%pragma(python) code = "import wx" //--------------------------------------------------------------------------- @@ -129,60 +157,64 @@ enum { //--------------------------------------------------------------------------- +MustHaveApp(wxOGLInitialize); void wxOGLInitialize(); + +MustHaveApp(wxOGLCleanUp); void wxOGLCleanUp(); %{ //--------------------------------------------------------------------------- -// This one will 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, char* className) { - wxPyTState* state = wxPyBeginBlockThreads(); +// Convert from a Python list to a list of className objects. This one will +// 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(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(blocked); return NULL; } int count = PyList_Size(pyList); wxList* list = new wxList; if (! list) { PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object"); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(blocked); return NULL; } for (int x=0; xAppend(wxo); } - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(blocked); return list; } //--------------------------------------------------------------------------- wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { - wxPyTState* state = wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(blocked); return NULL; } int count = PyList_Size(pyList); wxList* list = new wxList; if (! list) { PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object"); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(blocked); return NULL; } for (int x=0; xAppend((wxObject*) new wxRealPoint(*wxo)); } } - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(blocked); return list; } @@ -221,7 +253,7 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { // already be a pointer to a Python object that we can use // in the OOR data. wxShapeEvtHandler* seh = (wxShapeEvtHandler*)source; - wxPyClientData* data = (wxPyClientData*)seh->GetClientObject(); + wxPyOORClientData* data = (wxPyOORClientData*)seh->GetClientObject(); if (data) { target = data->m_obj; Py_INCREF(target); @@ -230,11 +262,52 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { if (! target) { target = wxPyMake_wxObject2(source, FALSE); if (target != Py_None) - ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyClientData(target)); + ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target)); } return target; } +//--------------------------------------------------------------------------- + +PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) { + wxList* list = (wxList*)listbase; + PyObject* pyList; + PyObject* pyObj; + wxObject* wxObj; + wxNode* node = list->GetFirst(); + + bool blocked = wxPyBeginBlockThreads(); + pyList = PyList_New(0); + while (node) { + wxObj = node->GetData(); + pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0); + PyList_Append(pyList, pyObj); + node = node->GetNext(); + } + wxPyEndBlockThreads(blocked); + return pyList; +} + +//--------------------------------------------------------------------------- + +PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { + wxList* list = (wxList*)listbase; + PyObject* pyList; + PyObject* pyObj; + wxObject* wxObj; + wxNode* node = list->GetFirst(); + + bool blocked = wxPyBeginBlockThreads(); + pyList = PyList_New(0); + while (node) { + wxObj = node->GetData(); + pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj); + PyList_Append(pyList, pyObj); + node = node->GetNext(); + } + wxPyEndBlockThreads(blocked); + return pyList; +} //--------------------------------------------------------------------------- @@ -257,23 +330,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyTextShape, wxTextShape); //--------------------------------------------------------------------------- -extern "C" SWIGEXPORT(void) initoglbasicc(); -extern "C" SWIGEXPORT(void) initoglshapesc(); -extern "C" SWIGEXPORT(void) initoglshapes2c(); -extern "C" SWIGEXPORT(void) initoglcanvasc(); +// extern "C" SWIGEXPORT(void) initoglbasicc(); +// extern "C" SWIGEXPORT(void) initoglshapesc(); +// extern "C" SWIGEXPORT(void) initoglshapes2c(); +// extern "C" SWIGEXPORT(void) initoglcanvasc(); %} %init %{ - initoglbasicc(); - initoglshapesc(); - initoglshapes2c(); - initoglcanvasc(); - +// initoglbasicc(); +// initoglshapesc(); +// initoglshapes2c(); +// initoglcanvasc(); - wxClassInfo::CleanUpClasses(); - wxClassInfo::InitializeClasses(); wxPyPtrTypeMap_Add("wxControlPoint", "wxPyControlPoint"); wxPyPtrTypeMap_Add("wxShapeCanvas", "wxPyShapeCanvas"); @@ -292,11 +362,5 @@ extern "C" SWIGEXPORT(void) initoglcanvasc(); %} -//---------------------------------------------------------------------- -// And this gets appended to the shadow class file. -//---------------------------------------------------------------------- - -%pragma(python) include="_oglextras.py"; - //--------------------------------------------------------------------------- //---------------------------------------------------------------------------