Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fixed a typemap.

Browse Source 
Added a Python list --> wxArrayInt typemap and wxArrayInt --> Python
list helper.

Added wxMultiChoiceDialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-01-21 21:33:07 +00:00
parent c9baf9d738
commit 293a0a8677
15 changed files with 359 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wxPython/b.bat
View File

@@ -72,6 +72,9 @@ elseiff "%1" == "a" then
call b.bat 15 c
call b.bat 15 f
cd demo
p15 encode_bitmaps.py
cd -
call b.bat 15 r
call b.bat 15 c
call b.bat 15 h

2
wxPython/contrib/gizmos/gizmos.cpp
View File

@@ -638,7 +638,7 @@ static PyObject *_wrap_wxEditableListBox_SetStrings(PyObject *self, PyObject *ar
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(_obj1, i);
PyObject* str = PyObject_Str(item);
_arg1->Add(PyString_AsString(item));
_arg1->Add(PyString_AsString(str));
Py_DECREF(item);
Py_DECREF(str);
}

13
wxPython/src/_extras.py
View File

@@ -576,6 +576,8 @@ class wxTimer(wxPyTimer):
wxColor = wxColour
wxNamedColor = wxNamedColour
wxPen = wxPyPen
wxScrollbar = wxScrollBar
# backwards compatibility
wxNoRefBitmap = wxBitmap
@@ -589,11 +591,12 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
#----------------------------------------------------------------------
# wxGTK sets the locale when initialized. Doing this at the Python
# level should set it up to match what GTK is doing at the C level.
try:
import locale
locale.setlocale(locale.LC_ALL, "")
except:
pass
if wxPlatform == "__WXGTK__":
try:
import locale
locale.setlocale(locale.LC_ALL, "")
except:
pass

27
wxPython/src/cmndlgs.i
View File

@@ -132,7 +132,30 @@ public:
//----------------------------------------------------------------------
//TODO: wxMultipleChoiceDialog
enum { wxCHOICEDLG_STYLE };
class wxMultiChoiceDialog : public wxDialog
{
public:
wxMultiChoiceDialog(wxWindow *parent,
const wxString& message,
const wxString& caption,
int LCOUNT, wxString *choices,
long style = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void SetSelections(const wxArrayInt& selections);
// wxArrayInt GetSelections() const;
%addmethods {
PyObject* GetSelections() {
return wxArrayInt2PyList_helper(self->GetSelections());
}
}
};
//----------------------------------------------------------------------
@@ -146,7 +169,7 @@ public:
wxString* caption,
int LCOUNT, wxString* choices,
//char** clientData = NULL,
long style = wxOK | wxCANCEL | wxCENTRE,
long style = wxCHOICEDLG_STYLE,
wxPoint* pos = &wxDefaultPosition) {
return new wxSingleChoiceDialog(parent, *message, *caption,
LCOUNT, choices, NULL, style, *pos);

2
wxPython/src/export.h
View File

@@ -67,7 +67,7 @@ static void wxPyCoreAPI_IMPORT() {
#define wxPyMake_wxSizer(a) (wxPyCoreAPIPtr->p_wxPyMake_wxSizer(a))
#define wxPyPtrTypeMap_Add(a, b) (wxPyCoreAPIPtr->p_wxPyPtrTypeMap_Add(a, b))
#define wxArrayString2PyList_helper(a) (wxPyCoreAPIPtr->p_wxArrayString2PyList_helper(a))
#define wxArrayInt2PyList_helper(a) (wxPyCoreAPIPtr->p_wxArrayInt2PyList_helper(a))
// This one is special. It's the first function called in SWIG generated

12
wxPython/src/helpers.cpp
View File

@@ -1490,6 +1490,18 @@ PyObject* wxArrayString2PyList_helper(const wxArrayString& arr) {
}
PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr) {
PyObject* list = PyList_New(0);
for (size_t i=0; i < arr.GetCount(); i++) {
PyObject* number = PyInt_FromLong(arr[i]);
PyList_Append(list, number);
Py_DECREF(number);
}
return list;
}
//----------------------------------------------------------------------
//----------------------------------------------------------------------

2
wxPython/src/helpers.h
View File

@@ -143,6 +143,7 @@ bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);
PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
#define RETURN_NONE() { Py_INCREF(Py_None); return Py_None; }
@@ -281,6 +282,7 @@ struct wxPyCoreAPI {
PyObject* (*p_wxPyMake_wxSizer)(wxSizer* source);
void (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
PyObject* (*p_wxArrayString2PyList_helper)(const wxArrayString& arr);
PyObject* (*p_wxArrayInt2PyList_helper)(const wxArrayInt& arr);
};
#ifdef wxPyUSE_EXPORT

246
wxPython/src/msw/cmndlgs.cpp
View File

@@ -1535,6 +1535,241 @@ static PyObject *_wrap_wxFileDialog_GetPaths(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static void *SwigwxMultiChoiceDialogTowxDialog(void *ptr) {
wxMultiChoiceDialog *src;
wxDialog *dest;
src = (wxMultiChoiceDialog *) ptr;
dest = (wxDialog *) src;
return (void *) dest;
}
static void *SwigwxMultiChoiceDialogTowxTopLevelWindow(void *ptr) {
wxMultiChoiceDialog *src;
wxTopLevelWindow *dest;
src = (wxMultiChoiceDialog *) ptr;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
static void *SwigwxMultiChoiceDialogTowxWindow(void *ptr) {
wxMultiChoiceDialog *src;
wxWindow *dest;
src = (wxMultiChoiceDialog *) ptr;
dest = (wxWindow *) src;
return (void *) dest;
}
static void *SwigwxMultiChoiceDialogTowxEvtHandler(void *ptr) {
wxMultiChoiceDialog *src;
wxEvtHandler *dest;
src = (wxMultiChoiceDialog *) ptr;
dest = (wxEvtHandler *) src;
return (void *) dest;
}
static void *SwigwxMultiChoiceDialogTowxObject(void *ptr) {
wxMultiChoiceDialog *src;
wxObject *dest;
src = (wxMultiChoiceDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMultiChoiceDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMultiChoiceDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxMultiChoiceDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMultiChoiceDialog * _result;
wxWindow * _arg0;
wxString * _arg1;
wxString * _arg2;
int _arg3;
wxString * _arg4;
long _arg5 = (long ) (wxCHOICEDLG_STYLE);
wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj4 = 0;
wxPoint temp;
PyObject * _obj6 = 0;
char *_kwnames[] = { "parent","message","caption","choices","style","pos", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO|lO:new_wxMultiChoiceDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_obj6))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMultiChoiceDialog. Expected _wxWindow_p.");
return NULL;
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg1 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
if (_obj4)
{
_arg4 = wxString_LIST_helper(_obj4);
if (_arg4 == NULL) {
return NULL;
}
}
if (_obj6)
{
_arg6 = &temp;
if (! wxPoint_helper(_obj6, &_arg6))
return NULL;
}
{
if (_obj4) {
_arg3 = PyList_Size(_obj4);
}
else {
_arg3 = 0;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMultiChoiceDialog *)new_wxMultiChoiceDialog(_arg0,*_arg1,*_arg2,_arg3,_arg4,_arg5,*_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMultiChoiceDialog_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
{
delete [] _arg4;
}
return _resultobj;
}
#define wxMultiChoiceDialog_SetSelections(_swigobj,_swigarg0) (_swigobj->SetSelections(_swigarg0))
static PyObject *_wrap_wxMultiChoiceDialog_SetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMultiChoiceDialog * _arg0;
wxArrayInt * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","selections", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMultiChoiceDialog_SetSelections",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMultiChoiceDialog_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMultiChoiceDialog_SetSelections. Expected _wxMultiChoiceDialog_p.");
return NULL;
}
}
{
if (! PySequence_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
return NULL;
}
_arg1 = new wxArrayInt;
int i, len=PySequence_Length(_obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(_obj1, i);
PyObject* number = PyNumber_Int(item);
_arg1->Add(PyInt_AS_LONG(number));
Py_DECREF(item);
Py_DECREF(number);
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMultiChoiceDialog_SetSelections(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
static PyObject * wxMultiChoiceDialog_GetSelections(wxMultiChoiceDialog *self) {
return wxArrayInt2PyList_helper(self->GetSelections());
}
static PyObject *_wrap_wxMultiChoiceDialog_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
PyObject * _result;
wxMultiChoiceDialog * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMultiChoiceDialog_GetSelections",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMultiChoiceDialog_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMultiChoiceDialog_GetSelections. Expected _wxMultiChoiceDialog_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)wxMultiChoiceDialog_GetSelections(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
_resultobj = _result;
}
return _resultobj;
}
static void *SwigwxSingleChoiceDialogTowxDialog(void *ptr) {
wxSingleChoiceDialog *src;
wxDialog *dest;
@@ -1588,7 +1823,7 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args,
wxString * _arg2;
int _arg3;
wxString * _arg4;
long _arg5 = (long ) wxOK|wxCANCEL|wxCENTRE;
long _arg5 = (long ) (wxCHOICEDLG_STYLE);
wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
@@ -3857,6 +4092,9 @@ static PyMethodDef cmndlgscMethods[] = {
{ "wxSingleChoiceDialog_GetStringSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
{ "wxSingleChoiceDialog_GetSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_GetSelection, METH_VARARGS | METH_KEYWORDS },
{ "new_wxSingleChoiceDialog", (PyCFunction) _wrap_new_wxSingleChoiceDialog, METH_VARARGS | METH_KEYWORDS },
{ "wxMultiChoiceDialog_GetSelections", (PyCFunction) _wrap_wxMultiChoiceDialog_GetSelections, METH_VARARGS | METH_KEYWORDS },
{ "wxMultiChoiceDialog_SetSelections", (PyCFunction) _wrap_wxMultiChoiceDialog_SetSelections, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMultiChoiceDialog", (PyCFunction) _wrap_new_wxMultiChoiceDialog, METH_VARARGS | METH_KEYWORDS },
{ "wxFileDialog_GetPaths", (PyCFunction) _wrap_wxFileDialog_GetPaths, METH_VARARGS | METH_KEYWORDS },
{ "wxFileDialog_GetFilenames", (PyCFunction) _wrap_wxFileDialog_GetFilenames, METH_VARARGS | METH_KEYWORDS },
{ "wxFileDialog_ShowModal", (PyCFunction) _wrap_wxFileDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
@@ -3929,6 +4167,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxTopLevelWindow","_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxMultiChoiceDialog",SwigwxMultiChoiceDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow},
@@ -3969,6 +4208,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxFontData",SwigwxFontDataTowxObject},
{ "_wxObject","_wxTextEntryDialog",SwigwxTextEntryDialogTowxObject},
{ "_wxObject","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxObject},
{ "_wxObject","_wxMultiChoiceDialog",SwigwxMultiChoiceDialogTowxObject},
{ "_wxObject","_wxFileDialog",SwigwxFileDialogTowxObject},
{ "_wxObject","_wxDirDialog",SwigwxDirDialogTowxObject},
{ "_wxObject","_wxColourDialog",SwigwxColourDialogTowxObject},
@@ -3988,6 +4228,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxDialog","_wxFontDialog",SwigwxFontDialogTowxDialog},
{ "_wxDialog","_wxTextEntryDialog",SwigwxTextEntryDialogTowxDialog},
{ "_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog},
{ "_wxDialog","_wxMultiChoiceDialog",SwigwxMultiChoiceDialogTowxDialog},
{ "_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog},
{ "_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog},
{ "_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog},
@@ -4035,6 +4276,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxEvtHandler","_wxFontDialog",SwigwxFontDialogTowxEvtHandler},
{ "_wxEvtHandler","_wxTextEntryDialog",SwigwxTextEntryDialogTowxEvtHandler},
{ "_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler},
{ "_wxEvtHandler","_wxMultiChoiceDialog",SwigwxMultiChoiceDialogTowxEvtHandler},
{ "_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler},
{ "_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler},
{ "_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler},
@@ -4044,6 +4286,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindow","_wxFontDialog",SwigwxFontDialogTowxWindow},
{ "_wxWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxWindow},
{ "_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow},
{ "_wxWindow","_wxMultiChoiceDialog",SwigwxMultiChoiceDialogTowxWindow},
{ "_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow},
{ "_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow},
{ "_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow},
@@ -4058,6 +4301,7 @@ SWIGEXPORT(void) initcmndlgsc() {
SWIG_globals = SWIG_newvarlink();
m = Py_InitModule("cmndlgsc", cmndlgscMethods);
d = PyModule_GetDict(m);
PyDict_SetItemString(d,"wxCHOICEDLG_STYLE", PyInt_FromLong((long) wxCHOICEDLG_STYLE));
PyDict_SetItemString(d,"wxFR_DOWN", PyInt_FromLong((long) wxFR_DOWN));
PyDict_SetItemString(d,"wxFR_WHOLEWORD", PyInt_FromLong((long) wxFR_WHOLEWORD));
PyDict_SetItemString(d,"wxFR_MATCHCASE", PyInt_FromLong((long) wxFR_MATCHCASE));

22
wxPython/src/msw/cmndlgs.py
View File

@@ -193,6 +193,27 @@ class wxFileDialog(wxFileDialogPtr):
class wxMultiChoiceDialogPtr(wxDialogPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def SetSelections(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxMultiChoiceDialog_SetSelections,(self,) + _args, _kwargs)
return val
def GetSelections(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxMultiChoiceDialog_GetSelections,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxMultiChoiceDialog instance at %s>" % (self.this,)
class wxMultiChoiceDialog(wxMultiChoiceDialogPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(cmndlgsc.new_wxMultiChoiceDialog,_args,_kwargs)
self.thisown = 1
self._setOORInfo(self)
class wxSingleChoiceDialogPtr(wxDialogPtr):
def __init__(self,this):
self.this = this
@@ -474,6 +495,7 @@ def wxPreFindReplaceDialog(*_args,**_kwargs):
#-------------- VARIABLE WRAPPERS ------------------
wxCHOICEDLG_STYLE = cmndlgsc.wxCHOICEDLG_STYLE
wxFR_DOWN = cmndlgsc.wxFR_DOWN
wxFR_WHOLEWORD = cmndlgsc.wxFR_WHOLEWORD
wxFR_MATCHCASE = cmndlgsc.wxFR_MATCHCASE

2
wxPython/src/msw/grid.cpp
View File

@@ -7861,7 +7861,7 @@ static PyObject *_wrap_wxGrid_GetTextBoxSize(PyObject *self, PyObject *args, PyO
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(_obj2, i);
PyObject* str = PyObject_Str(item);
_arg2->Add(PyString_AsString(item));
_arg2->Add(PyString_AsString(str));
Py_DECREF(item);
Py_DECREF(str);
}

2
wxPython/src/msw/misc2.cpp
View File

@@ -7896,7 +7896,7 @@ static PyObject *_wrap_new_wxFileTypeInfoSequence(PyObject *self, PyObject *args
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(_obj0, i);
PyObject* str = PyObject_Str(item);
_arg0->Add(PyString_AsString(item));
_arg0->Add(PyString_AsString(str));
Py_DECREF(item);
Py_DECREF(str);
}

3
wxPython/src/msw/wx.cpp
View File

@@ -676,7 +676,8 @@ static wxPyCoreAPI API = {
wxPyMake_wxObject,
wxPyMake_wxSizer,
wxPyPtrTypeMap_Add,
wxArrayString2PyList_helper
wxArrayString2PyList_helper,
wxArrayInt2PyList_helper
};

13
wxPython/src/msw/wx.py
View File

@@ -1453,6 +1453,8 @@ class wxTimer(wxPyTimer):
wxColor = wxColour
wxNamedColor = wxNamedColour
wxPen = wxPyPen
wxScrollbar = wxScrollBar
# backwards compatibility
wxNoRefBitmap = wxBitmap
@@ -1466,11 +1468,12 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
#----------------------------------------------------------------------
# wxGTK sets the locale when initialized. Doing this at the Python
# level should set it up to match what GTK is doing at the C level.
try:
import locale
locale.setlocale(locale.LC_ALL, "")
except:
pass
if wxPlatform == "__WXGTK__":
try:
import locale
locale.setlocale(locale.LC_ALL, "")
except:
pass

27
wxPython/src/my_typemaps.i
View File

@@ -282,7 +282,7 @@
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem($source, i);
PyObject* str = PyObject_Str(item);
$target->Add(PyString_AsString(item));
$target->Add(PyString_AsString(str));
Py_DECREF(item);
Py_DECREF(str);
}
@@ -293,6 +293,31 @@
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;
}
//---------------------------------------------------------------------------
// Map T_OUTPUTs for floats to return ints.

3
wxPython/src/wx.i
View File

@@ -199,7 +199,8 @@ static wxPyCoreAPI API = {
wxPyMake_wxObject,
wxPyMake_wxSizer,
wxPyPtrTypeMap_Add,
wxArrayString2PyList_helper
wxArrayString2PyList_helper,
wxArrayInt2PyList_helper
};