//----------------------------------------------------------------------
// Typemaps to convert a list of items to an int (size) and an array
+%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
+
+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);
}
+
//---------------------------------------------------------------------------
// 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)
//---------------------------------------------------------------------------
// 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;
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);
}
+%typemap(out) wxCharBuffer {
+ $result = PyString_FromString((char*)$1.data());
+}
+
+
//---------------------------------------------------------------------------
// Typemaps to convert Python sequence objects (tuples, etc.) to
// wxSize, wxPoint, wxRealPoint, and wxRect.
//---------------------------------------------------------------------------
// 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; i<len; i++) {
PyObject* item = PySequence_GetItem($input, i);
-%#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-%#else
- PyObject* str = PyObject_Str(item);
-%#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- $1->Add(Py2wxString(str));
+ $1->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
//---------------------------------------------------------------------------
// Typemap for wxArrayInt from Python sequence objects
-%typemap(in) wxArrayInt& (bool temp=False) {
+%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;
+ temp = true;
int i, len=PySequence_Length($input);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem($input, i);
}
-// 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;
- }
+//---------------------------------------------------------------------------
+// wxFileOffset, can be a 32-bit or a 64-bit integer
+
+%typemap(in) wxFileOffset {
+ if (sizeof(wxFileOffset) > sizeof(long))
+ $1 = PyLong_AsLongLong($input);
+ else
+ $1 = PyInt_AsLong($input);
}
-%}
-
-%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(out) wxFileOffset {
+ if (sizeof(wxFileOffset) > sizeof(long))
+ $result = PyLong_FromLongLong($1);
+ else
+ $result = PyInt_FromLong($1);
}
-%}
//---------------------------------------------------------------------------
// to the real derived type, if possible. See wxPyMake_wxObject in
// helpers.cpp
-%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) wxGridTableBase* { $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) wxHtmlWindow* { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxWizardPage* { $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); }
+// NOTE: For those classes that also call _setOORInfo these typemaps should be
+// disabled for the constructor.
+
+%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenu* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxValidator* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+%typemap(out) wxApp* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxDC* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxImage* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxObject* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolBarToolBase* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolTip* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+
+%typemap(out) wxBitmapButton* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxButton* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxControl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+//%typemap(out) wxListCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxNotebook* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxStatusBar* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+//%typemap(out) wxTreeCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxWizardPage* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPanel* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxDialog* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxScrolledWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+%typemap(out) wxSizer* { $result = wxPyMake_wxObject($1, (bool)$owner); }
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff