//---------------------------------------------------------------------------
-// Tell SWIG to wrap all the wrappers with Python's thread macros
+// Tell SWIG to wrap all the wrappers with our thread protection
%except(python) {
- wxPy_BEGIN_ALLOW_THREADS;
- $function
- wxPy_END_ALLOW_THREADS;
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+$function
+ wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}
//---------------------------------------------------------------------------
-%{
-#if PYTHON_API_VERSION >= 1009
- static char* wxStringErrorMsg = "String or Unicode type required";
-#else
- static char* wxStringErrorMsg = "String type required";
-#endif
-%}
-
-// TODO: Which works best???
-
-// Implementation #1
-// %typemap(python, in) wxString& (PyObject* temp, int tmpDoDecRef) {
-// temp = $source;
-// tmpDoDecRef = 0;
-// #if PYTHON_API_VERSION >= 1009
-// if (PyUnicode_Check(temp) {
-// temp = PyUnicode_AsUTF8String(temp);
-// if (! temp) {
-// PyErr_SetString(PyExc_TypeError, "Unicode encoding to UTF8 failed.");
-// return NULL;
-// }
-// tmpDoDecRef = 1;
-// #endif
-// if (!PyString_Check(temp)) {
-// PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-// return NULL;
-// }
-// $target = new wxString(PyString_AsString(temp), PyString_Size(temp));
-// #if PYTHON_API_VERESION >= 1009
-// if (tmpDoDecRef) Py_DECREF(temp);
-// #endif
-// }
-
-
-// Implementation #2
+
%typemap(python, in) wxString& {
-#if PYTHON_API_VERSION >= 1009
- char* tmpPtr; int tmpSize;
- if (!PyString_Check($source) && !PyUnicode_Check($source)) {
- PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
- return NULL;
- }
- if (PyString_AsStringAndSize($source, &tmpPtr, &tmpSize) == -1)
- return NULL;
- $target = new wxString(tmpPtr, tmpSize);
-#else
- if (!PyString_Check($source)) {
- PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+ $target = wxString_in_helper($source);
+ if ($target == NULL)
return NULL;
- }
- $target = new wxString(PyString_AS_STRING($source), PyString_GET_SIZE($source));
-#endif
}
-
-
%typemap(python, freearg) wxString& {
if ($target)
delete $source;
%typemap(python, out) wxString {
+#if wxUSE_UNICODE
+ $target = PyUnicode_FromWideChar($source->c_str(), $source->Len());
+#else
$target = PyString_FromStringAndSize($source->c_str(), $source->Len());
+#endif
}
%typemap(python, ret) wxString {
delete $source;
%typemap(python, out) wxString* {
+#if wxUSE_UNICODE
+ $target = PyUnicode_FromWideChar($source->c_str(), $source->Len());
+#else
$target = PyString_FromStringAndSize($source->c_str(), $source->Len());
+#endif
}
+//---------------------------------------------------------------------------
+
+
+%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(python, freearg) wxMemoryBuffer& {
+ if ($target)
+ delete $source;
+}
+
+%typemap(python, out) wxMemoryBuffer {
+ $target = PyString_FromStringAndSize((char*)$source->GetData(), $source->GetDataLen());
+}
+
+%typemap(python, ret) wxMemoryBuffer {
+ delete $source;
+}
//---------------------------------------------------------------------------
return NULL;
}
+%typemap(python,in) wxPoint2DDouble& (wxPoint2DDouble temp) {
+ $target = &temp;
+ if (! wxPoint2DDouble_helper($source, &$target))
+ return NULL;
+}
+
//---------------------------------------------------------------------------
// Typemap to convert strings to wxColour. Two string formats are accepted,
// either a colour name, or a hex colour spec like "#RRGGBB"
int i, len=PySequence_Length($source);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem($source, i);
+#if wxUSE_UNICODE
+ PyObject* str = PyObject_Unicode(item);
+#else
PyObject* str = PyObject_Str(item);
- $target->Add(PyString_AsString(item));
+#endif
+ $target->Add(Py2wxString(str));
Py_DECREF(item);
Py_DECREF(str);
}
delete $source;
}
+//---------------------------------------------------------------------------
+// Typemap for wxArrayInt from Python sequence objects
+
+%typemap(python,in) wxArrayInt& {
+ if (! PySequence_Check($source)) {
+ PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
+ return NULL;
+ }
+ $target = new wxArrayInt;
+ int i, len=PySequence_Length($source);
+ for (i=0; i<len; i++) {
+ PyObject* item = PySequence_GetItem($source, i);
+ PyObject* number = PyNumber_Int(item);
+ $target->Add(PyInt_AS_LONG(number));
+ Py_DECREF(item);
+ Py_DECREF(number);
+ }
+}
+
+%typemap(python, freearg) wxArrayInt& {
+ if ($target)
+ delete $source;
+}
+
+
+// Typemaps to convert an array of ints to a list
+%typemap(python, out) wxArrayInt& {
+ $target = PyList_New(0);
+ size_t idx;
+ for (idx = 0; idx < $source->GetCount(); idx += 1) {
+ PyObject* val = PyInt_FromLong($source->Item(idx));
+ PyList_Append($target, val);
+ Py_DECREF(val);
+ }
+}
+
+%typemap(python, out) wxArrayInt {
+ $target = PyList_New(0);
+ size_t idx;
+ for (idx = 0; idx < $source->GetCount(); idx += 1) {
+ PyObject* val = PyInt_FromLong($source->Item(idx));
+ PyList_Append($target, val);
+ Py_DECREF(val);
+ }
+ delete $source;
+}
+
+
//---------------------------------------------------------------------------
// Map T_OUTPUTs for floats to return ints.
$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(python,ignore) byte *T_OUTPUT(int temp)
+{
+ $target = (byte*)&temp;
+}
+
+%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(python,ignore) wxCoord *OUTPUT = int *OUTPUT;
+%typemap(python,argout) wxCoord *OUTPUT = int *OUTPUT;
+
+
//---------------------------------------------------------------------------
// Typemaps to convert return values that are base class pointers
// to the real derived type, if possible. See wxPyMake_wxObject in
%typemap(python, out) wxMenu* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxValidator* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxApp* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxPyApp* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxDC* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxFSFile* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxFileSystem* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxMouseEvent* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxObject* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxPyPrintout* { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxSizer* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxToolBarToolBase* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxToolTip* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxBitmapButton* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxButton* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxControl* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxFrame* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxGrid* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxListCtrl* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxMDIChildFrame* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxMDIClientWindow* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxMenuBar* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxTextCtrl* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxToolBar* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxToolBarBase* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxTreeCtrl* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxWindow* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxHtmlWindow* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxPyHtmlWindow* { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxWizardPage* { $target = wxPyMake_wxObject($source); }
+
+%typemap(python, out) wxSizer* { $target = wxPyMake_wxSizer($source); }
//%typemap(python, out) wxHtmlCell* { $target = wxPyMake_wxObject($source); }
projects / wxWidgets.git / blobdiff