X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19a97bd6f98edc899ee0c3b2f2c4fe4ee8a0082b..2fa9ab8174120441e96d8e1031a57fb6ffd34441:/wxPython/contrib/ogl/ogl.i diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i index 41f78d72fc..2bf13628ec 100644 --- a/wxPython/contrib/ogl/ogl.i +++ b/wxPython/contrib/ogl/ogl.i @@ -14,30 +14,47 @@ %module ogl %{ -#include "export.h" +#include "wx/wxPython/wxPython.h" +#include "wx/wxPython/pyclasses.h" #include "oglhelpers.h" + + + static const wxString wxPyEmptyString(wxT("")); %} //--------------------------------------------------------------------------- -%include typemaps.i -%include my_typemaps.i - -%extern wx.i %import windows.i -%extern _defs.i -%extern misc.i -%extern gdi.i -%include _ogldefs.i +%pythoncode { wx = core } -%import oglbasic.i -%import oglshapes.i -%import oglshapes2.i -%import oglcanvas.i +%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" //--------------------------------------------------------------------------- @@ -135,54 +152,55 @@ 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) { + wxPyBeginBlockThreads(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); 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(); return NULL; } for (int x=0; xAppend(wxo); } - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); return list; } //--------------------------------------------------------------------------- wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); 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(); return NULL; } for (int x=0; xAppend((wxObject*) new wxRealPoint(*wxo)); } } - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); return list; } +//--------------------------------------------------------------------------- + +PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { + PyObject* target = NULL; + + if (source && wxIsKindOf(source, wxShapeEvtHandler)) { + // If it's derived from wxShapeEvtHandler then there may + // already be a pointer to a Python object that we can use + // in the OOR data. + wxShapeEvtHandler* seh = (wxShapeEvtHandler*)source; + wxPyOORClientData* data = (wxPyOORClientData*)seh->GetClientObject(); + if (data) { + target = data->m_obj; + Py_INCREF(target); + } + } + if (! target) { + target = wxPyMake_wxObject2(source, FALSE); + if (target != Py_None) + ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target)); + } + return target; +} + +//--------------------------------------------------------------------------- + +PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { + wxList* list = (wxList*)listbase; + PyObject* pyList; + PyObject* pyObj; + wxObject* wxObj; + wxNode* node = list->GetFirst(); + + wxPyBeginBlockThreads(); + pyList = PyList_New(0); + while (node) { + wxObj = node->GetData(); + pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj); + PyList_Append(pyList, pyObj); + node = node->GetNext(); + } + wxPyEndBlockThreads(); + return pyList; +} + //--------------------------------------------------------------------------- @@ -232,23 +295,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"); @@ -267,11 +327,5 @@ extern "C" SWIGEXPORT(void) initoglcanvasc(); %} -//---------------------------------------------------------------------- -// And this gets appended to the shadow class file. -//---------------------------------------------------------------------- - -%pragma(python) include="_oglextras.py"; - //--------------------------------------------------------------------------- //---------------------------------------------------------------------------