/////////////////////////////////////////////////////////////////////////////
-//---------------------------------------------------------------------------
-// Tell SWIG to wrap all the wrappers with our thread protection
-
-%exception {
- PyThreadState* __tstate = wxPyBeginAllowThreads();
- $action
- wxPyEndAllowThreads(__tstate);
- if (PyErr_Occurred()) SWIG_fail;
-}
-
-
//----------------------------------------------------------------------
// Typemaps to convert a list of items to an int (size) and an array
}
-
-
//---------------------------------------------------------------------------
// wxString typemaps
delete $1;
}
-
-
-%typemap(out) wxString {
+%typemap(out) wxString& {
%#if wxUSE_UNICODE
- $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
+ $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
%#else
- $result = PyString_FromStringAndSize($1.c_str(), $1.Len());
+ $result = PyString_FromStringAndSize($1->c_str(), $1->Len());
%#endif
}
-%typemap(out) wxString* {
+
+%apply wxString& { wxString* }
+
+
+
+%typemap(out) wxString {
%#if wxUSE_UNICODE
- $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
+ $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
%#else
- $result = PyString_FromStringAndSize($1->c_str(), $1->Len());
+ $result = PyString_FromStringAndSize($1.c_str(), $1.Len());
%#endif
}
$1 = *sptr;
delete sptr;
}
-
-
-// //---------------------------------------------------------------------------
+%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxString& {
+ $1 = PyString_Check($input) || PyUnicode_Check($input);
+}
+//---------------------------------------------------------------------------
+// wxMemoryBuffer (needed for wxSTC)
-// %typemap(python, in) wxMemoryBuffer& {
-// if (!PyString_Check($source)) {
-// PyErr_SetString(PyExc_TypeError, "String buffer expected");
-// return NULL;
-// }
-// char* str = PyString_AS_STRING($source);
-// int len = PyString_GET_SIZE($source);
-// $target = new wxMemoryBuffer(len);
-// memcpy($target->GetData(), str, len);
-// }
+%typemap(in) wxMemoryBuffer& (bool temp=False) {
+ if (!PyString_Check($input)) {
+ PyErr_SetString(PyExc_TypeError, "String buffer expected");
+ SWIG_fail;
+ }
+ char* str = PyString_AS_STRING($input);
+ int len = PyString_GET_SIZE($input);
+ $1 = new wxMemoryBuffer(len);
+ temp = True;
+ memcpy($1->GetData(), str, len);
+ $1->SetDataLen(len);
+}
-// %typemap(python, freearg) wxMemoryBuffer& {
-// if ($target)
-// delete $source;
-// }
+%typemap(freearg) wxMemoryBuffer& {
+ if (temp$argnum) delete $1;
+}
-// %typemap(python, out) wxMemoryBuffer {
-// $target = PyString_FromStringAndSize((char*)$source->GetData(), $source->GetDataLen());
-// }
+%typemap(out) wxMemoryBuffer {
+ $result = PyString_FromStringAndSize((char*)$1.GetData(), $1.GetDataLen());
+}
-// %typemap(python, ret) wxMemoryBuffer {
-// delete $source;
-// }
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Typemap for wxArrayString from Python sequence objects
-%typemap(in) wxArrayString& {
+%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;
int i, len=PySequence_Length($input);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem($input, i);
%#else
PyObject* str = PyObject_Str(item);
%#endif
+ if (PyErr_Occurred()) SWIG_fail;
$1->Add(Py2wxString(str));
Py_DECREF(item);
Py_DECREF(str);
}
%typemap(freearg) wxArrayString& {
- if ($1) delete $1;
+ if (temp$argnum) delete $1;
}
//---------------------------------------------------------------------------
// Typemap for wxArrayInt from Python sequence objects
-%typemap(in) wxArrayInt& {
+%typemap(in) wxArrayInt& (bool temp=False) {
if (! PySequence_Check($input)) {
PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
SWIG_fail;
}
$1 = new wxArrayInt;
+ temp = True;
int i, len=PySequence_Length($input);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem($input, i);
}
%typemap(freearg) wxArrayInt& {
- if ($1) delete $1;
+ if (temp$argnum) delete $1;
}
-// Typemaps to convert an array of ints to a list for return values
+// Typemaps to convert an array of strings to a list for return values
%typemap(out) wxArrayString& {
$result = wxArrayString2PyList_helper(*$1);
}
}
-// //---------------------------------------------------------------------------
-// // Map T_OUTPUTs for floats to return ints.
-
-
-// %typemap(python,ignore) float *T_OUTPUT_TOINT(float temp),
-// double *T_OUTPUT_TOINT(double temp)
-// {
-// $target = &temp;
-// }
-
-
-// %typemap(python,argout) float *T_OUTPUT_TOINT,
-// double *T_OUTPUT_TOINT
-// {
-// PyObject *o;
-// o = PyInt_FromLong((long) (*$source));
-// $target = t_output_helper($target, o);
-// }
-
-
-// %typemap(python,ignore) bool *T_OUTPUT(int temp)
-// {
-// $target = (bool*)&temp;
-// }
-
-// %typemap(python,argout) bool *T_OUTPUT
-// {
-// PyObject *o;
-// o = PyInt_FromLong((long) (*$source));
-// $target = t_output_helper($target, o);
-// }
-
-// %typemap(python,ignore) bool *OUTPUT = bool *T_OUTPUT;
-// %typemap(python,argout) bool *OUTPUT = bool *T_OUTPUT;
+//---------------------------------------------------------------------------
+%typemap(out) bool {
+ $result = $1 ? Py_True : Py_False; Py_INCREF($result);
+}
-// %typemap(python,ignore) byte *T_OUTPUT(int temp)
-// {
-// $target = (byte*)&temp;
-// }
+// These fragments are iserted in modules that need to convert PyObjects to
+// integer values, my versions allow any numeric type to be used, as long as
+// it can be converted to a PyInt. (Specifically, I allow floats where the
+// default SWIG_AsLong would raise an obsucre exception from within
+// PyLong_AsLong.)
+
+%fragment("SWIG_AsLong","header") %{
+SWIGSTATICINLINE(long)
+SWIG_AsLong(PyObject * obj)
+{
+ if (PyNumber_Check(obj))
+ return PyInt_AsLong(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;
+ }
+}
+%}
+
+%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(python,argout) byte *T_OUTPUT
-// {
-// PyObject *o;
-// o = PyInt_FromLong((long) (*$source));
-// $target = t_output_helper($target, o);
-// }
-// %typemap(python,ignore) byte *OUTPUT = byte *T_OUTPUT;
-// %typemap(python,argout) byte *OUTPUT = byte *T_OUTPUT;
+//---------------------------------------------------------------------------
+// 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
+// GDI object's internal refcounting scheme will do a copy-on-write of the
+// internal data as needed.
+// These too?
+//, wxRegion&, wxPalette&
-// %typemap(python,ignore) wxCoord *OUTPUT = int *OUTPUT;
-// %typemap(python,argout) wxCoord *OUTPUT = int *OUTPUT;
+%typemap(out) wxBrush&, wxPen&, wxFont&, wxBitmap&, wxIcon&, wxCursor& {
+ $*1_ltype* resultptr = new $*1_ltype(*$1);
+ $result = SWIG_NewPointerObj((void*)(resultptr), $1_descriptor, 1);
+}
//---------------------------------------------------------------------------
// 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) 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) 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); }
+
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff