X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97d6a30b2cb028c228982ae3bb93d3701f83f5ed..84f85550e5e9f026d8518244cc47227e3e428a0f:/wxPython/src/my_typemaps.i diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i index d9b078bc4e..33f6d98e20 100644 --- a/wxPython/src/my_typemaps.i +++ b/wxPython/src/my_typemaps.i @@ -11,20 +11,27 @@ ///////////////////////////////////////////////////////////////////////////// -//--------------------------------------------------------------------------- -// Tell SWIG to wrap all the wrappers with our thread protection +//---------------------------------------------------------------------- +// Typemaps to convert a list of items to an int (size) and an array -%exception { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - $action - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; -} +%define MAKE_INT_ARRAY_TYPEMAPS(NAME, ARR_NAME) + %typemap(in) (int NAME, int* ARR_NAME) { + $1 = PyList_Size($input); + $2 = int_LIST_helper($input); + if ($2 == NULL) SWIG_fail; + } + %typemap(freearg) (int NAME, int* ARR_NAME) { + if ($2) delete [] $2; + } +%enddef -//---------------------------------------------------------------------- -// Typemaps to convert a list of items to an int (size) and an array +MAKE_INT_ARRAY_TYPEMAPS(widths, widths_field) +MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) + + +// Same things for a wxString %typemap(in) (int choices, wxString* choices_array ) { $1 = PyList_Size($input); $2 = wxString_LIST_helper($input); @@ -35,14 +42,15 @@ } + //--------------------------------------------------------------------------- // wxString typemaps -%typemap(in) wxString& (bool temp=False) { +%typemap(in) wxString& (bool temp=false) { $1 = wxString_in_helper($input); if ($1 == NULL) SWIG_fail; - temp = True; + temp = true; } %typemap(freearg) wxString& { if (temp$argnum) @@ -93,7 +101,7 @@ //--------------------------------------------------------------------------- // wxMemoryBuffer (needed for wxSTC) -%typemap(in) wxMemoryBuffer& (bool temp=False) { +%typemap(in) wxMemoryBuffer& (bool temp=false) { if (!PyString_Check($input)) { PyErr_SetString(PyExc_TypeError, "String buffer expected"); SWIG_fail; @@ -101,7 +109,7 @@ char* str = PyString_AS_STRING($input); int len = PyString_GET_SIZE($input); $1 = new wxMemoryBuffer(len); - temp = True; + temp = true; memcpy($1->GetData(), str, len); $1->SetDataLen(len); } @@ -183,13 +191,13 @@ //--------------------------------------------------------------------------- // Typemap for wxArrayString from Python sequence objects -%typemap(in) wxArrayString& (bool temp=False) { +%typemap(in) wxArrayString& (bool temp=false) { if (! PySequence_Check($input)) { PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); SWIG_fail; } $1 = new wxArrayString; - temp = True; + temp = true; int i, len=PySequence_Length($input); for (i=0; iob_type->tp_name); - PyErr_SetObject(PyExc_TypeError, errmsg); - Py_DECREF(errmsg); - return 0; - } -} -%} - -%fragment("SWIG_AsUnsignedLong","header", fragment="SWIG_AsLong") %{ -SWIGSTATICINLINE(unsigned long) -SWIG_AsUnsignedLong(PyObject * obj) -{ - if (PyLong_Check(obj)) { - return PyLong_AsUnsignedLong(obj); - } else { - long i = SWIG_AsLong(obj); - if ( !PyErr_Occurred() && (i < 0)) { - PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type"); - } - return i; - } -} -%} - - -%fragment("SWIG_AsDouble","header") %{ -SWIGSTATICINLINE(double) -SWIG_AsDouble(PyObject *obj) -{ - if (PyNumber_Check(obj)) - return PyFloat_AsDouble(obj); - else { - PyObject* errmsg = PyString_FromFormat("Expected number, got %s", - obj->ob_type->tp_name); - PyErr_SetObject(PyExc_TypeError, errmsg); - Py_DECREF(errmsg); - return 0; - } -} -%} - - //--------------------------------------------------------------------------- // Typemap for when GDI objects are returned by reference. This will cause a // copy to be made instead of returning a reference to the same instance. The @@ -351,57 +303,55 @@ SWIG_AsDouble(PyObject *obj) // to the real derived type, if possible. See wxPyMake_wxObject in // helpers.cpp -%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMenu* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxValidator* { $result = wxPyMake_wxObject($1); } - -%typemap(out) wxApp* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxDC* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxGridTableBase* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxObject* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolBarToolBase* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolTip* { $result = wxPyMake_wxObject($1); } - - -%typemap(out) wxBitmapButton* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxButton* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxControl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxGrid* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxListCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxNotebook* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxStatusBar* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxTreeCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxHtmlWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxWizardPage* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxPanel* { $result = wxPyMake_wxObject($1); } -%typemap(out) wxDialog* { $result = wxPyMake_wxObject($1); } - -%typemap(out) wxSizer* { $result = wxPyMake_wxSizer($1); } - - -//%typemap(python, out) wxHtmlCell* { $target = wxPyMake_wxObject($source); } -//%typemap(python, out) wxHtmlContainerCell* { $target = wxPyMake_wxObject($source); } -//%typemap(python, out) wxHtmlParser* { $target = wxPyMake_wxObject($source); } -//%typemap(python, out) wxHtmlWinParser* { $target = wxPyMake_wxObject($source); } +// NOTE: For those classes that also call _setOORInfo these typemaps should be +// disabled for the constructor. + +%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxMenu* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxValidator* { $result = wxPyMake_wxObject($1, $owner); } + +%typemap(out) wxApp* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxDC* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxObject* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxToolBarToolBase* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxToolTip* { $result = wxPyMake_wxObject($1, $owner); } + + +%typemap(out) wxBitmapButton* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxButton* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxControl* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, $owner); } +//%typemap(out) wxListCtrl* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxNotebook* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxStatusBar* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1, $owner); } +//%typemap(out) wxTreeCtrl* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxWizardPage* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxPanel* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxDialog* { $result = wxPyMake_wxObject($1, $owner); } +%typemap(out) wxScrolledWindow* { $result = wxPyMake_wxObject($1, $owner); } + +%typemap(out) wxSizer* { $result = wxPyMake_wxSizer($1, $owner); } + //--------------------------------------------------------------------------- //---------------------------------------------------------------------------