From 36cadbf72dfea68f8fe817b5a65e12da7c88982f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 8 May 2004 01:11:02 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/ogl/gtk/ogl.py | 4 + wxPython/contrib/ogl/gtk/ogl_wrap.cpp | 86 +++++-- wxPython/contrib/stc/gtk/stc_wrap.cpp | 1 + wxPython/src/gtk/_core.py | 2 + wxPython/src/gtk/_misc.py | 41 ++-- wxPython/src/gtk/_misc_wrap.cpp | 311 +++++++++----------------- 6 files changed, 203 insertions(+), 242 deletions(-) diff --git a/wxPython/contrib/ogl/gtk/ogl.py b/wxPython/contrib/ogl/gtk/ogl.py index 2360c8308c..78dd91288b 100644 --- a/wxPython/contrib/ogl/gtk/ogl.py +++ b/wxPython/contrib/ogl/gtk/ogl.py @@ -3190,6 +3190,10 @@ class PyLineShape(PyShape): """GetLineControlPoints(self) -> PyObject""" return _ogl.PyLineShape_GetLineControlPoints(*args, **kwargs) + def SetLineControlPoints(*args, **kwargs): + """SetLineControlPoints(self, PyObject list)""" + return _ogl.PyLineShape_SetLineControlPoints(*args, **kwargs) + def SetAttachmentFrom(*args, **kwargs): """SetAttachmentFrom(self, int fromAttach)""" return _ogl.PyLineShape_SetAttachmentFrom(*args, **kwargs) diff --git a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp index b137351d19..aaffa6f8da 100644 --- a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp @@ -584,7 +584,25 @@ void wxPyLineShape_AddArrowOrdered(wxPyLineShape *self,wxArrowHead *arrow,PyObje } PyObject *wxPyLineShape_GetLineControlPoints(wxPyLineShape *self){ wxList* list = self->GetLineControlPoints(); - return wxPy_ConvertShapeList(list); + return wxPy_ConvertRealPointList(list); + } +void wxPyLineShape_SetLineControlPoints(wxPyLineShape *self,PyObject *list){ + wxList* real_point_list = wxPy_wxRealPoint_ListHelper(list); + self->MakeLineControlPoints((int)(real_point_list->GetCount())); + wxList* old_control_points = self->GetLineControlPoints(); + wxNode* old_node = old_control_points->GetFirst(); + wxNode* real_node = real_point_list->GetFirst(); + while(old_node) + { + wxRealPoint* old_point = (wxRealPoint*)old_node->GetData(); + wxRealPoint* new_point = (wxRealPoint*)real_node->GetData(); + old_point->x = new_point->x; + old_point->y = new_point->y; + old_node = old_node->GetNext(); + real_node = real_node->GetNext(); + } + self->ClearPointList(*real_point_list); + delete real_point_list; } WXSHAPE_IMP_CALLBACKS(wxPyPolygonShape, wxPolygonShape); @@ -600,21 +618,7 @@ PyObject *wxPyPolygonShape_Create(wxPyPolygonShape *self,PyObject *points){ } PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){ wxList* list = self->GetPoints(); - PyObject* pyList; - PyObject* pyObj; - wxObject* wxObj; - wxNode* node = list->GetFirst(); - - bool blocked = wxPyBeginBlockThreads(); - pyList = PyList_New(0); - while (node) { - wxObj = node->GetData(); - pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0); - PyList_Append(pyList, pyObj); - node = node->GetNext(); - } - wxPyEndBlockThreads(blocked); - return pyList; + return wxPy_ConvertRealPointList(list); } PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){ wxList* list = self->GetOriginalPoints(); @@ -760,6 +764,27 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { //--------------------------------------------------------------------------- +PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) { + wxList* list = (wxList*)listbase; + PyObject* pyList; + PyObject* pyObj; + wxObject* wxObj; + wxNode* node = list->GetFirst(); + + bool blocked = wxPyBeginBlockThreads(); + pyList = PyList_New(0); + while (node) { + wxObj = node->GetData(); + pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0); + PyList_Append(pyList, pyObj); + node = node->GetNext(); + } + wxPyEndBlockThreads(blocked); + return pyList; +} + +//--------------------------------------------------------------------------- + PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { wxList* list = (wxList*)listbase; PyObject* pyList; @@ -26383,6 +26408,34 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject } +static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "list", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetLineControlPoints",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = obj1; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPyLineShape_SetLineControlPoints(arg1,arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; @@ -33192,6 +33245,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PyLineShape_SetLineControlPoints", (PyCFunction) _wrap_PyLineShape_SetLineControlPoints, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/contrib/stc/gtk/stc_wrap.cpp b/wxPython/contrib/stc/gtk/stc_wrap.cpp index a5e2ad39c7..8cb353deec 100644 --- a/wxPython/contrib/stc/gtk/stc_wrap.cpp +++ b/wxPython/contrib/stc/gtk/stc_wrap.cpp @@ -714,6 +714,7 @@ static PyObject *_wrap_StyledTextCtrl_AddStyledText(PyObject *self, PyObject *ar arg2 = new wxMemoryBuffer(len); temp2 = True; memcpy(arg2->GetData(), str, len); + arg2->SetDataLen(len); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 69cbe9f28a..fd419d624d 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -5115,6 +5115,8 @@ This program needs access to the screen. Please run with 'pythonw', not 'python', and only when you are logged in on the main display of your Mac.""" _sys.exit(1) + except SystemExit: + raise except: pass diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index a221887ce5..ad2461053b 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -2020,13 +2020,9 @@ SOUND_LOOP = _misc_.SOUND_LOOP class Sound(object): def __repr__(self): return "<%s.%s; proxy of C++ wxSound instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args): - """ - __init__(self) -> Sound - __init__(self, String fileName, bool isResource=false) -> Sound - __init__(self, int size, wxByte data) -> Sound - """ - newobj = _misc_.new_Sound(*args) + def __init__(self, *args, **kwargs): + """__init__(self, String fileName=EmptyString) -> Sound""" + newobj = _misc_.new_Sound(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown @@ -2036,24 +2032,25 @@ class Sound(object): if self.thisown: destroy(self) except: pass - def Create(*args): - """ - Create(self, String fileName, bool isResource=false) -> bool - Create(self, int size, wxByte data) -> bool - """ - return _misc_.Sound_Create(*args) + def Create(*args, **kwargs): + """Create(self, String fileName) -> bool""" + return _misc_.Sound_Create(*args, **kwargs) + + def CreateFromData(*args, **kwargs): + """CreateFromData(self, PyObject data) -> bool""" + return _misc_.Sound_CreateFromData(*args, **kwargs) def IsOk(*args, **kwargs): """IsOk(self) -> bool""" return _misc_.Sound_IsOk(*args, **kwargs) - def Play(*args): + def Play(*args, **kwargs): """Play(self, unsigned int flags=SOUND_ASYNC) -> bool""" - return _misc_.Sound_Play(*args) + return _misc_.Sound_Play(*args, **kwargs) - def PlaySound(*args): + def PlaySound(*args, **kwargs): """PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool""" - return _misc_.Sound_PlaySound(*args) + return _misc_.Sound_PlaySound(*args, **kwargs) PlaySound = staticmethod(PlaySound) def Stop(*args, **kwargs): @@ -2070,9 +2067,15 @@ class SoundPtr(Sound): self.__class__ = Sound _misc_.Sound_swigregister(SoundPtr) -def Sound_PlaySound(*args): +def SoundFromData(*args, **kwargs): + """SoundFromData(PyObject data) -> Sound""" + val = _misc_.new_SoundFromData(*args, **kwargs) + val.thisown = 1 + return val + +def Sound_PlaySound(*args, **kwargs): """Sound_PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool""" - return _misc_.Sound_PlaySound(*args) + return _misc_.Sound_PlaySound(*args, **kwargs) def Sound_Stop(*args, **kwargs): """Sound_Stop()""" diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 8332ea7723..1c91c59338 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -232,11 +232,11 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLogTextCtrl swig_types[23] #define SWIGTYPE_p_wxTextCtrl swig_types[24] #define SWIGTYPE_p_wxBusyCursor swig_types[25] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[26] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[27] -#define SWIGTYPE_p_wxTextDataObject swig_types[28] -#define SWIGTYPE_p_wxDataObject swig_types[29] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[30] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[26] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[27] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[28] +#define SWIGTYPE_p_wxTextDataObject swig_types[29] +#define SWIGTYPE_p_wxDataObject swig_types[30] #define SWIGTYPE_p_wxFileDataObject swig_types[31] #define SWIGTYPE_p_wxCustomDataObject swig_types[32] #define SWIGTYPE_p_wxURLDataObject swig_types[33] @@ -288,11 +288,10 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPyLog swig_types[79] #define SWIGTYPE_p_wxLogNull swig_types[80] #define SWIGTYPE_p_wxColour swig_types[81] -#define SWIGTYPE_p_wxByte swig_types[82] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[83] -#define SWIGTYPE_p_wxPyTimer swig_types[84] -#define SWIGTYPE_p_wxDateSpan swig_types[85] -static swig_type_info *swig_types[87]; +#define SWIGTYPE_p_wxConfigPathChanger swig_types[82] +#define SWIGTYPE_p_wxPyTimer swig_types[83] +#define SWIGTYPE_p_wxDateSpan swig_types[84] +static swig_type_info *swig_types[86]; /* -------- TYPES TABLE (END) -------- */ @@ -855,7 +854,7 @@ public: "wxSound is not available on this platform."); wxPyEndBlockThreads(blocked); } - wxSound(const wxString&, bool) { + wxSound(const wxString&/*, bool*/) { bool blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxSound is not available on this platform."); @@ -870,7 +869,7 @@ public: ~wxSound() {}; - bool Create(const wxString&, bool) { return false; } + bool Create(const wxString&/*, bool*/) { return false; } bool Create(int, const wxByte*) { return false; }; bool IsOk() { return false; }; bool Play(unsigned) const { return false; } @@ -880,6 +879,45 @@ public: #endif +wxSound *new_wxSound(wxString const &fileName){ + if (fileName.Length() == 0) + return new wxSound; + else + return new wxSound(fileName); + } +wxSound *new_wxSound(PyObject *data){ + unsigned char* buffer; int size; + wxSound *sound = NULL; + + bool blocked = wxPyBeginBlockThreads(); + if (!PyArg_Parse(data, "t#", &buffer, &size)) + goto done; + sound = new wxSound(size, buffer); + done: + wxPyEndBlockThreads(blocked); + return sound; + } +bool wxSound_CreateFromData(wxSound *self,PyObject *data){ + #ifndef __WXMAC__ + unsigned char* buffer; + int size; + bool rv = False; + + bool blocked = wxPyBeginBlockThreads(); + if (!PyArg_Parse(data, "t#", &buffer, &size)) + goto done; + rv = self->Create(size, buffer); + done: + wxPyEndBlockThreads(blocked); + return rv; + #else + bool blocked = wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "Create from data is not available on this platform."); + wxPyEndBlockThreads(blocked); + return False; + #endif + } #include @@ -11395,47 +11433,28 @@ static PyObject * JoystickEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_Sound__SWIG_0(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxSound *result; - - if(!PyArg_ParseTuple(args,(char *)":new_Sound")) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSound *)new wxSound(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSound, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_Sound__SWIG_1(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_Sound(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxString *arg1 = 0 ; - bool arg2 = (bool) false ; + wxString const &arg1_defvalue = wxPyEmptyString ; + wxString *arg1 = (wxString *) &arg1_defvalue ; wxSound *result; bool temp1 = False ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "fileName", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|O:new_Sound",&obj0,&obj1)) goto fail; - { - arg1 = wxString_in_helper(obj0); - if (arg1 == NULL) SWIG_fail; - temp1 = True; - } - if (obj1) { - arg2 = (bool) SWIG_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Sound",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSound *)new wxSound((wxString const &)*arg1,arg2); + result = (wxSound *)new_wxSound((wxString const &)*arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11455,22 +11474,20 @@ static PyObject *_wrap_new_Sound__SWIG_1(PyObject *self, PyObject *args) { } -static PyObject *_wrap_new_Sound__SWIG_2(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_SoundFromData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - int arg1 ; - wxByte *arg2 = (wxByte *) 0 ; + PyObject *arg1 = (PyObject *) 0 ; wxSound *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "data", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"OO:new_Sound",&obj0,&obj1)) goto fail; - arg1 = (int) SWIG_AsInt(obj0); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxByte, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_SoundFromData",kwnames,&obj0)) goto fail; + arg1 = obj0; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSound *)new wxSound(arg1,(wxByte const *)arg2); + result = (wxSound *)new_wxSound(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11482,57 +11499,6 @@ static PyObject *_wrap_new_Sound__SWIG_2(PyObject *self, PyObject *args) { } -static PyObject *_wrap_new_Sound(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[3]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 2); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if (argc == 0) { - return _wrap_new_Sound__SWIG_0(self,args); - } - if ((argc >= 1) && (argc <= 2)) { - int _v; - { - _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); - } - if (_v) { - if (argc <= 1) { - return _wrap_new_Sound__SWIG_1(self,args); - } - _v = SWIG_CheckBool(argv[1]); - if (_v) { - return _wrap_new_Sound__SWIG_1(self,args); - } - } - } - if (argc == 2) { - int _v; - _v = SWIG_CheckInt(argv[0]); - if (_v) { - { - void *ptr; - if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxByte, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - return _wrap_new_Sound__SWIG_2(self,args); - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_Sound'"); - return NULL; -} - - static PyObject *_wrap_delete_Sound(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSound *arg1 = (wxSound *) 0 ; @@ -11558,18 +11524,19 @@ static PyObject *_wrap_delete_Sound(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_Sound_Create__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_Sound_Create(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSound *arg1 = (wxSound *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) false ; bool result; bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "fileName", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"OO|O:Sound_Create",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sound_Create",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSound, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -11577,13 +11544,9 @@ static PyObject *_wrap_Sound_Create__SWIG_0(PyObject *self, PyObject *args) { if (arg2 == NULL) SWIG_fail; temp2 = True; } - if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create((wxString const &)*arg2,arg3); + result = (bool)(arg1)->Create((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11605,26 +11568,24 @@ static PyObject *_wrap_Sound_Create__SWIG_0(PyObject *self, PyObject *args) { } -static PyObject *_wrap_Sound_Create__SWIG_1(PyObject *self, PyObject *args) { +static PyObject *_wrap_Sound_CreateFromData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSound *arg1 = (wxSound *) 0 ; - int arg2 ; - wxByte *arg3 = (wxByte *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "data", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"OOO:Sound_Create",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sound_CreateFromData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSound, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxByte, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,(wxByte const *)arg3); + result = (bool)wxSound_CreateFromData(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11638,76 +11599,6 @@ static PyObject *_wrap_Sound_Create__SWIG_1(PyObject *self, PyObject *args) { } -static PyObject *_wrap_Sound_Create(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[4]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 3); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if ((argc >= 2) && (argc <= 3)) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxSound, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); - } - if (_v) { - if (argc <= 2) { - return _wrap_Sound_Create__SWIG_0(self,args); - } - _v = SWIG_CheckBool(argv[2]); - if (_v) { - return _wrap_Sound_Create__SWIG_0(self,args); - } - } - } - } - if (argc == 3) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxSound, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - _v = SWIG_CheckInt(argv[1]); - if (_v) { - { - void *ptr; - if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxByte, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - return _wrap_Sound_Create__SWIG_1(self,args); - } - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Sound_Create'"); - return NULL; -} - - static PyObject *_wrap_Sound_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSound *arg1 = (wxSound *) 0 ; @@ -11736,15 +11627,18 @@ static PyObject *_wrap_Sound_IsOk(PyObject *self, PyObject *args, PyObject *kwar } -static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args) { +static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSound *arg1 = (wxSound *) 0 ; unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|O:Sound_Play",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Sound_Play",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSound, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { @@ -11767,7 +11661,7 @@ static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args) { } -static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args) { +static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ; @@ -11775,8 +11669,11 @@ static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args) { bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "filename",(char *) "flags", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|O:Sound_PlaySound",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Sound_PlaySound",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -28364,12 +28261,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"JoystickEvent_ButtonUp", (PyCFunction) _wrap_JoystickEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS }, { (char *)"JoystickEvent_ButtonIsDown", (PyCFunction) _wrap_JoystickEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS }, { (char *)"JoystickEvent_swigregister", JoystickEvent_swigregister, METH_VARARGS }, - { (char *)"new_Sound", _wrap_new_Sound, METH_VARARGS }, + { (char *)"new_Sound", (PyCFunction) _wrap_new_Sound, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_SoundFromData", (PyCFunction) _wrap_new_SoundFromData, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Sound", (PyCFunction) _wrap_delete_Sound, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Sound_Create", _wrap_Sound_Create, METH_VARARGS }, + { (char *)"Sound_Create", (PyCFunction) _wrap_Sound_Create, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_CreateFromData", (PyCFunction) _wrap_Sound_CreateFromData, METH_VARARGS | METH_KEYWORDS }, { (char *)"Sound_IsOk", (PyCFunction) _wrap_Sound_IsOk, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Sound_Play", _wrap_Sound_Play, METH_VARARGS }, - { (char *)"Sound_PlaySound", _wrap_Sound_PlaySound, METH_VARARGS }, + { (char *)"Sound_Play", (PyCFunction) _wrap_Sound_Play, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_PlaySound", (PyCFunction) _wrap_Sound_PlaySound, METH_VARARGS | METH_KEYWORDS }, { (char *)"Sound_Stop", (PyCFunction) _wrap_Sound_Stop, METH_VARARGS | METH_KEYWORDS }, { (char *)"Sound_swigregister", Sound_swigregister, METH_VARARGS }, { (char *)"new_FileTypeInfo", (PyCFunction) _wrap_new_FileTypeInfo, METH_VARARGS | METH_KEYWORDS }, @@ -29354,11 +29253,11 @@ static swig_type_info _swigt__p_wxLogStderr[] = {{"_p_wxLogStderr", 0, "wxLogStd static swig_type_info _swigt__p_wxLogTextCtrl[] = {{"_p_wxLogTextCtrl", 0, "wxLogTextCtrl *", 0, 0, 0, 0},{"_p_wxLogTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0, 0, 0, 0},{"_p_wxTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBusyCursor[] = {{"_p_wxBusyCursor", 0, "wxBusyCursor *", 0, 0, 0, 0},{"_p_wxBusyCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTextDataObject[] = {{"_p_wxPyTextDataObject", 0, "wxPyTextDataObject *", 0, 0, 0, 0},{"_p_wxPyTextDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBitmapDataObject[] = {{"_p_wxBitmapDataObject", 0, "wxBitmapDataObject *", 0, 0, 0, 0},{"_p_wxBitmapDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxBitmapDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTextDataObject[] = {{"_p_wxTextDataObject", 0, "wxTextDataObject *", 0, 0, 0, 0},{"_p_wxTextDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxTextDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDataObject[] = {{"_p_wxDataObject", 0, "wxDataObject *", 0, 0, 0, 0},{"_p_wxDataObjectSimple", _p_wxDataObjectSimpleTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxDataObjectComposite", _p_wxDataObjectCompositeTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxURLDataObject", _p_wxURLDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0, 0, 0, 0},{"_p_wxFileDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCustomDataObject[] = {{"_p_wxCustomDataObject", 0, "wxCustomDataObject *", 0, 0, 0, 0},{"_p_wxCustomDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxURLDataObject[] = {{"_p_wxURLDataObject", 0, "wxURLDataObject *", 0, 0, 0, 0},{"_p_wxURLDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -29410,7 +29309,6 @@ static swig_type_info _swigt__p_wxProcessEvent[] = {{"_p_wxProcessEvent", 0, "wx static swig_type_info _swigt__p_wxPyLog[] = {{"_p_wxPyLog", 0, "wxPyLog *", 0, 0, 0, 0},{"_p_wxPyLog", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLogNull[] = {{"_p_wxLogNull", 0, "wxLogNull *", 0, 0, 0, 0},{"_p_wxLogNull", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxByte[] = {{"_p_wxByte", 0, "wxByte *", 0, 0, 0, 0},{"_p_wxByte", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxConfigPathChanger[] = {{"_p_wxConfigPathChanger", 0, "wxConfigPathChanger *", 0, 0, 0, 0},{"_p_wxConfigPathChanger", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTimer[] = {{"_p_wxPyTimer", 0, "wxPyTimer *", 0, 0, 0, 0},{"_p_wxPyTimer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDateSpan[] = {{"_p_wxDateSpan", 0, "wxDateSpan *", 0, 0, 0, 0},{"_p_wxDateSpan", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -29442,11 +29340,11 @@ _swigt__p_wxLogStderr, _swigt__p_wxLogTextCtrl, _swigt__p_wxTextCtrl, _swigt__p_wxBusyCursor, +_swigt__p_wxPyBitmapDataObject, _swigt__p_wxPyTextDataObject, _swigt__p_wxBitmapDataObject, _swigt__p_wxTextDataObject, _swigt__p_wxDataObject, -_swigt__p_wxPyBitmapDataObject, _swigt__p_wxFileDataObject, _swigt__p_wxCustomDataObject, _swigt__p_wxURLDataObject, @@ -29498,7 +29396,6 @@ _swigt__p_wxProcessEvent, _swigt__p_wxPyLog, _swigt__p_wxLogNull, _swigt__p_wxColour, -_swigt__p_wxByte, _swigt__p_wxConfigPathChanger, _swigt__p_wxPyTimer, _swigt__p_wxDateSpan, -- 2.45.2