Fixed how the list of files is converted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -963,11 +963,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (int i=0; i<count; i++) {
|
for (int i=0; i<count; i++) {
|
||||||
#if wxUSE_UNICODE
|
PyList_SetItem(list, i, wx2PyString(files[i]));
|
||||||
PyList_SetItem(list, i, PyUnicode_FromWideChar(files[i], files[i].Len()));
|
|
||||||
#else
|
|
||||||
PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
@@ -952,11 +952,7 @@ PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (int i=0; i<count; i++) {
|
for (int i=0; i<count; i++) {
|
||||||
|
PyList_SetItem(list, i, wx2PyString(files[i]));
|
||||||
|
|
||||||
|
|
||||||
PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
@@ -30181,8 +30177,8 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje
|
|||||||
static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
PyObject *resultobj;
|
PyObject *resultobj;
|
||||||
wxSizer *arg1 = (wxSizer *) 0 ;
|
wxSizer *arg1 = (wxSizer *) 0 ;
|
||||||
wxSize arg2 ;
|
wxSize *arg2 = 0 ;
|
||||||
wxSize *argp2 ;
|
wxSize temp2 ;
|
||||||
PyObject * obj0 = 0 ;
|
PyObject * obj0 = 0 ;
|
||||||
PyObject * obj1 = 0 ;
|
PyObject * obj1 = 0 ;
|
||||||
char *kwnames[] = {
|
char *kwnames[] = {
|
||||||
@@ -30191,11 +30187,13 @@ static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject
|
|||||||
|
|
||||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetMinSize",kwnames,&obj0,&obj1)) goto fail;
|
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetMinSize",kwnames,&obj0,&obj1)) goto fail;
|
||||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||||
if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
|
{
|
||||||
arg2 = *argp2;
|
arg2 = &temp2;
|
||||||
|
if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
|
||||||
|
}
|
||||||
{
|
{
|
||||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||||
(arg1)->SetMinSize(arg2);
|
(arg1)->SetMinSize((wxSize const &)*arg2);
|
||||||
|
|
||||||
wxPyEndAllowThreads(__tstate);
|
wxPyEndAllowThreads(__tstate);
|
||||||
if (PyErr_Occurred()) SWIG_fail;
|
if (PyErr_Occurred()) SWIG_fail;
|
||||||
|
Reference in New Issue
Block a user