X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..0bdcd2f50750d235bff2766f3d03d7228aa88dff:/wxPython/contrib/ogl/ogl.i diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i index 0b00d351f9..01bdc1d12f 100644 --- a/wxPython/contrib/ogl/ogl.i +++ b/wxPython/contrib/ogl/ogl.i @@ -14,38 +14,48 @@ %module ogl %{ -#include "helpers.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()) } -%include _ogldefs.i -%import oglbasic.i -%import oglshapes.i -%import oglshapes2.i -%import oglcanvas.i +MAKE_CONST_WXSTRING_NOSWIG(EmptyString); +%include _ogl_rename.i -%{ -#if defined(__WXMSW__) - wxString wxPyEmptyStr(""); - wxPoint wxPyDefaultPosition(-1, -1); - wxSize wxPyDefaultSize(-1, -1); -#endif -%} +%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" //--------------------------------------------------------------------------- @@ -141,35 +151,182 @@ void wxOGLInitialize(); void wxOGLCleanUp(); +%{ //--------------------------------------------------------------------------- + +// 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(blocked); + return NULL; + } + int count = PyList_Size(pyList); + wxList* list = new wxList; + if (! list) { + PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object"); + wxPyEndBlockThreads(blocked); + return NULL; + } + for (int x=0; xAppend(wxo); + } + wxPyEndBlockThreads(blocked); + return list; +} + //--------------------------------------------------------------------------- + +wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { + bool blocked = wxPyBeginBlockThreads(); + if (!PyList_Check(pyList)) { + PyErr_SetString(PyExc_TypeError, "Expected a list object."); + 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(blocked); + return NULL; + } + for (int x=0; xAppend((wxObject*) new wxRealPoint(val1, val2)); + + } else { + wxRealPoint* wxo = NULL; + if (wxPyConvertSwigPtr(pyo, (void **)&wxo, wxT("wxRealPoint"))) { + PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples"); + wxPyEndBlockThreads(blocked); + return NULL; + } + list->Append((wxObject*) new wxRealPoint(*wxo)); + } + } + wxPyEndBlockThreads(blocked); + return list; +} + //--------------------------------------------------------------------------- -%{ -extern "C" SWIGEXPORT(void) initoglbasicc(); -extern "C" SWIGEXPORT(void) initoglshapesc(); -extern "C" SWIGEXPORT(void) initoglshapes2c(); -extern "C" SWIGEXPORT(void) initoglcanvasc(); -%} +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; +} -%init %{ +//--------------------------------------------------------------------------- - initoglbasicc(); - initoglshapesc(); - initoglshapes2c(); - initoglcanvasc(); +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; +} - wxClassInfo::CleanUpClasses(); - wxClassInfo::InitializeClasses(); +//--------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxPyShapeCanvas, wxShapeCanvas); +IMPLEMENT_DYNAMIC_CLASS(wxPyShapeEvtHandler, wxShapeEvtHandler); +IMPLEMENT_ABSTRACT_CLASS(wxPyShape, wxShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyRectangleShape, wxRectangleShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyControlPoint, wxControlPoint); +IMPLEMENT_DYNAMIC_CLASS(wxPyBitmapShape, wxBitmapShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyDrawnShape, wxDrawnShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyCompositeShape, wxCompositeShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyDividedShape, wxDividedShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyDivisionShape, wxDivisionShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyEllipseShape, wxEllipseShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyCircleShape, wxCircleShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyLineShape, wxLineShape); +IMPLEMENT_DYNAMIC_CLASS(wxPyPolygonShape, wxPolygonShape); +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(); %} -//---------------------------------------------------------------------- -// And this gets appended to the shadow class file. -//---------------------------------------------------------------------- -%pragma(python) include="_extras.py"; +%init %{ + +// initoglbasicc(); +// initoglshapesc(); +// initoglshapes2c(); +// initoglcanvasc(); + + + wxPyPtrTypeMap_Add("wxControlPoint", "wxPyControlPoint"); + wxPyPtrTypeMap_Add("wxShapeCanvas", "wxPyShapeCanvas"); + wxPyPtrTypeMap_Add("wxShapeEvtHandler", "wxPyShapeEvtHandler"); + wxPyPtrTypeMap_Add("wxShape", "wxPyShape"); + wxPyPtrTypeMap_Add("wxRectangleShape", "wxPyRectangleShape"); + wxPyPtrTypeMap_Add("wxDrawnShape", "wxPyDrawnShape"); + wxPyPtrTypeMap_Add("wxCompositeShape", "wxPyCompositeShape"); + wxPyPtrTypeMap_Add("wxDividedShape", "wxPyDividedShape"); + wxPyPtrTypeMap_Add("wxDivisionShape", "wxPyDivisionShape"); + wxPyPtrTypeMap_Add("wxEllipseShape", "wxPyEllipseShape"); + wxPyPtrTypeMap_Add("wxCircleShape", "wxPyCircleShape"); + wxPyPtrTypeMap_Add("wxLineShape", "wxPyLineShape"); + wxPyPtrTypeMap_Add("wxPolygonShape", "wxPyPolygonShape"); + wxPyPtrTypeMap_Add("wxTextShape", "wxPyTextShape"); + +%} //--------------------------------------------------------------------------- //---------------------------------------------------------------------------