From 8961add6aaf26a969a0073f209a38be08a1541e2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 12 Jul 2002 21:37:38 +0000 Subject: [PATCH] SWIGged changes for wxMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/mac/misc2.cpp | 100 ++++++++++++++++++++++++++++++++ wxPython/src/mac/misc2.py | 31 ++++++++++ wxPython/src/mac/utils.cpp | 115 ++++++++++++++++--------------------- 3 files changed, 181 insertions(+), 65 deletions(-) diff --git a/wxPython/src/mac/misc2.cpp b/wxPython/src/mac/misc2.cpp index 2b0aa0725c..f087aaa0f5 100644 --- a/wxPython/src/mac/misc2.cpp +++ b/wxPython/src/mac/misc2.cpp @@ -6041,6 +6041,81 @@ static void *SwigwxPyProcessTowxObject(void *ptr) { return (void *) dest; } +static PyObject *_wrap_wxProcess_Kill(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxKillError _result; + int _arg0; + wxSignal _arg1 = (wxSignal ) (wxSIGTERM); + char *_kwnames[] = { "pid","sig", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i|i:wxProcess_Kill",_kwnames,&_arg0,&_arg1)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxKillError )wxPyProcess::Kill(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxProcess_Exists(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + int _arg0; + char *_kwnames[] = { "pid", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxProcess_Exists",_kwnames,&_arg0)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPyProcess::Exists(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxProcess_Open(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyProcess * _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "cmd", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxProcess_Open",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPyProcess *)wxPyProcess::Open(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyProcess_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + #define new_wxProcess(_swigarg0,_swigarg1) (new wxPyProcess(_swigarg0,_swigarg1)) static PyObject *_wrap_new_wxProcess(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -10317,6 +10392,9 @@ static PyMethodDef misc2cMethods[] = { { "wxProcess__setCallbackInfo", (PyCFunction) _wrap_wxProcess__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { "wxProcess_Destroy", (PyCFunction) _wrap_wxProcess_Destroy, METH_VARARGS | METH_KEYWORDS }, { "new_wxProcess", (PyCFunction) _wrap_new_wxProcess, METH_VARARGS | METH_KEYWORDS }, + { "wxProcess_Open", (PyCFunction) _wrap_wxProcess_Open, METH_VARARGS | METH_KEYWORDS }, + { "wxProcess_Exists", (PyCFunction) _wrap_wxProcess_Exists, METH_VARARGS | METH_KEYWORDS }, + { "wxProcess_Kill", (PyCFunction) _wrap_wxProcess_Kill, METH_VARARGS | METH_KEYWORDS }, { "wxProcessEvent_m_exitcode_get", (PyCFunction) _wrap_wxProcessEvent_m_exitcode_get, METH_VARARGS | METH_KEYWORDS }, { "wxProcessEvent_m_exitcode_set", (PyCFunction) _wrap_wxProcessEvent_m_exitcode_set, METH_VARARGS | METH_KEYWORDS }, { "wxProcessEvent_m_pid_get", (PyCFunction) _wrap_wxProcessEvent_m_pid_get, METH_VARARGS | METH_KEYWORDS }, @@ -10739,6 +10817,28 @@ SWIGEXPORT(void) initmisc2c() { PyDict_SetItemString(d,"wxTraceMessages", PyInt_FromLong((long) wxTraceMessages)); PyDict_SetItemString(d,"wxTraceResAlloc", PyInt_FromLong((long) wxTraceResAlloc)); PyDict_SetItemString(d,"wxTraceRefCount", PyInt_FromLong((long) wxTraceRefCount)); + PyDict_SetItemString(d,"wxKILL_OK", PyInt_FromLong((long) wxKILL_OK)); + PyDict_SetItemString(d,"wxKILL_BAD_SIGNAL", PyInt_FromLong((long) wxKILL_BAD_SIGNAL)); + PyDict_SetItemString(d,"wxKILL_ACCESS_DENIED", PyInt_FromLong((long) wxKILL_ACCESS_DENIED)); + PyDict_SetItemString(d,"wxKILL_NO_PROCESS", PyInt_FromLong((long) wxKILL_NO_PROCESS)); + PyDict_SetItemString(d,"wxKILL_ERROR", PyInt_FromLong((long) wxKILL_ERROR)); + PyDict_SetItemString(d,"wxSIGNONE", PyInt_FromLong((long) wxSIGNONE)); + PyDict_SetItemString(d,"wxSIGHUP", PyInt_FromLong((long) wxSIGHUP)); + PyDict_SetItemString(d,"wxSIGINT", PyInt_FromLong((long) wxSIGINT)); + PyDict_SetItemString(d,"wxSIGQUIT", PyInt_FromLong((long) wxSIGQUIT)); + PyDict_SetItemString(d,"wxSIGILL", PyInt_FromLong((long) wxSIGILL)); + PyDict_SetItemString(d,"wxSIGTRAP", PyInt_FromLong((long) wxSIGTRAP)); + PyDict_SetItemString(d,"wxSIGABRT", PyInt_FromLong((long) wxSIGABRT)); + PyDict_SetItemString(d,"wxSIGIOT", PyInt_FromLong((long) wxSIGIOT)); + PyDict_SetItemString(d,"wxSIGEMT", PyInt_FromLong((long) wxSIGEMT)); + PyDict_SetItemString(d,"wxSIGFPE", PyInt_FromLong((long) wxSIGFPE)); + PyDict_SetItemString(d,"wxSIGKILL", PyInt_FromLong((long) wxSIGKILL)); + PyDict_SetItemString(d,"wxSIGBUS", PyInt_FromLong((long) wxSIGBUS)); + PyDict_SetItemString(d,"wxSIGSEGV", PyInt_FromLong((long) wxSIGSEGV)); + PyDict_SetItemString(d,"wxSIGSYS", PyInt_FromLong((long) wxSIGSYS)); + PyDict_SetItemString(d,"wxSIGPIPE", PyInt_FromLong((long) wxSIGPIPE)); + PyDict_SetItemString(d,"wxSIGALRM", PyInt_FromLong((long) wxSIGALRM)); + PyDict_SetItemString(d,"wxSIGTERM", PyInt_FromLong((long) wxSIGTERM)); PyDict_SetItemString(d,"wxEVT_END_PROCESS", PyInt_FromLong((long) wxEVT_END_PROCESS)); PyDict_SetItemString(d,"wxEXEC_ASYNC", PyInt_FromLong((long) wxEXEC_ASYNC)); PyDict_SetItemString(d,"wxEXEC_SYNC", PyInt_FromLong((long) wxEXEC_SYNC)); diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py index 93159e2f6e..3d4a57d2ec 100644 --- a/wxPython/src/mac/misc2.py +++ b/wxPython/src/mac/misc2.py @@ -1192,6 +1192,15 @@ wxLog_GetTraceMask = misc2c.wxLog_GetTraceMask wxLog_IsAllowedTraceMask = misc2c.wxLog_IsAllowedTraceMask +wxProcess_Kill = misc2c.wxProcess_Kill + +wxProcess_Exists = misc2c.wxProcess_Exists + +def wxProcess_Open(*_args, **_kwargs): + val = apply(misc2c.wxProcess_Open,_args,_kwargs) + if val: val = wxProcessPtr(val) + return val + wxFileType_ExpandCommand = misc2c.wxFileType_ExpandCommand wxMimeTypesManager_IsOfType = misc2c.wxMimeTypesManager_IsOfType @@ -1326,6 +1335,28 @@ wxTraceMemAlloc = misc2c.wxTraceMemAlloc wxTraceMessages = misc2c.wxTraceMessages wxTraceResAlloc = misc2c.wxTraceResAlloc wxTraceRefCount = misc2c.wxTraceRefCount +wxKILL_OK = misc2c.wxKILL_OK +wxKILL_BAD_SIGNAL = misc2c.wxKILL_BAD_SIGNAL +wxKILL_ACCESS_DENIED = misc2c.wxKILL_ACCESS_DENIED +wxKILL_NO_PROCESS = misc2c.wxKILL_NO_PROCESS +wxKILL_ERROR = misc2c.wxKILL_ERROR +wxSIGNONE = misc2c.wxSIGNONE +wxSIGHUP = misc2c.wxSIGHUP +wxSIGINT = misc2c.wxSIGINT +wxSIGQUIT = misc2c.wxSIGQUIT +wxSIGILL = misc2c.wxSIGILL +wxSIGTRAP = misc2c.wxSIGTRAP +wxSIGABRT = misc2c.wxSIGABRT +wxSIGIOT = misc2c.wxSIGIOT +wxSIGEMT = misc2c.wxSIGEMT +wxSIGFPE = misc2c.wxSIGFPE +wxSIGKILL = misc2c.wxSIGKILL +wxSIGBUS = misc2c.wxSIGBUS +wxSIGSEGV = misc2c.wxSIGSEGV +wxSIGSYS = misc2c.wxSIGSYS +wxSIGPIPE = misc2c.wxSIGPIPE +wxSIGALRM = misc2c.wxSIGALRM +wxSIGTERM = misc2c.wxSIGTERM wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS wxEXEC_ASYNC = misc2c.wxEXEC_ASYNC wxEXEC_SYNC = misc2c.wxEXEC_SYNC diff --git a/wxPython/src/mac/utils.cpp b/wxPython/src/mac/utils.cpp index 4cefd4da56..6ebc5ec1c8 100644 --- a/wxPython/src/mac/utils.cpp +++ b/wxPython/src/mac/utils.cpp @@ -5127,10 +5127,16 @@ static PyObject *_wrap_wxDateTime___cmp__(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxDateTime_ParseRfc822Date(_swigobj,_swigarg0) (_swigobj->ParseRfc822Date(_swigarg0)) +static int wxDateTime_ParseRfc822Date(wxDateTime *self,const wxString & date) { + const wxChar* rv; + const wxChar* _date = date; + rv = self->ParseRfc822Date(_date); + if (rv == NULL) return -1; + return rv - _date; + } static PyObject *_wrap_wxDateTime_ParseRfc822Date(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; + int _result; wxDateTime * _arg0; wxString * _arg1; PyObject * _argo0 = 0; @@ -5154,31 +5160,28 @@ static PyObject *_wrap_wxDateTime_ParseRfc822Date(PyObject *self, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxDateTime_ParseRfc822Date(_arg0,*_arg1)); + _result = (int )wxDateTime_ParseRfc822Date(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} _resultobj = Py_BuildValue("i",_result); { if (_obj1) delete _arg1; -} -{ - delete _result; } return _resultobj; } -#define wxDateTime_ParseFormat(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->ParseFormat(_swigarg0,_swigarg1,_swigarg2)) +static int wxDateTime_ParseFormat(wxDateTime *self,const wxString & date,const wxString & format,const wxDateTime & dateDef) { + const wxChar* rv; + const wxChar* _date = date; + rv = self->ParseFormat(_date, format, dateDef); + if (rv == NULL) return -1; + return rv - _date; + } static PyObject *_wrap_wxDateTime_ParseFormat(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; + int _result; wxDateTime * _arg0; wxString * _arg1; wxString * _arg2 = (wxString *) &wxPyDateFormatStr; @@ -5219,17 +5222,11 @@ static PyObject *_wrap_wxDateTime_ParseFormat(PyObject *self, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxDateTime_ParseFormat(_arg0,*_arg1,*_arg2,*_arg3)); + _result = (int )wxDateTime_ParseFormat(_arg0,*_arg1,*_arg2,*_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} _resultobj = Py_BuildValue("i",_result); { if (_obj1) delete _arg1; @@ -5237,17 +5234,20 @@ static PyObject *_wrap_wxDateTime_ParseFormat(PyObject *self, PyObject *args, Py { if (_obj2) delete _arg2; -} -{ - delete _result; } return _resultobj; } -#define wxDateTime_ParseDateTime(_swigobj,_swigarg0) (_swigobj->ParseDateTime(_swigarg0)) +static int wxDateTime_ParseDateTime(wxDateTime *self,const wxString & datetime) { + const wxChar* rv; + const wxChar* _datetime = datetime; + rv = self->ParseDateTime(_datetime); + if (rv == NULL) return -1; + return rv - _datetime; + } static PyObject *_wrap_wxDateTime_ParseDateTime(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; + int _result; wxDateTime * _arg0; wxString * _arg1; PyObject * _argo0 = 0; @@ -5271,31 +5271,28 @@ static PyObject *_wrap_wxDateTime_ParseDateTime(PyObject *self, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxDateTime_ParseDateTime(_arg0,*_arg1)); + _result = (int )wxDateTime_ParseDateTime(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} _resultobj = Py_BuildValue("i",_result); { if (_obj1) delete _arg1; -} -{ - delete _result; } return _resultobj; } -#define wxDateTime_ParseDate(_swigobj,_swigarg0) (_swigobj->ParseDate(_swigarg0)) +static int wxDateTime_ParseDate(wxDateTime *self,const wxString & date) { + const wxChar* rv; + const wxChar* _date = date; + rv = self->ParseDate(_date); + if (rv == NULL) return -1; + return rv - _date; + } static PyObject *_wrap_wxDateTime_ParseDate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; + int _result; wxDateTime * _arg0; wxString * _arg1; PyObject * _argo0 = 0; @@ -5319,31 +5316,28 @@ static PyObject *_wrap_wxDateTime_ParseDate(PyObject *self, PyObject *args, PyOb } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxDateTime_ParseDate(_arg0,*_arg1)); + _result = (int )wxDateTime_ParseDate(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} _resultobj = Py_BuildValue("i",_result); { if (_obj1) delete _arg1; -} -{ - delete _result; } return _resultobj; } -#define wxDateTime_ParseTime(_swigobj,_swigarg0) (_swigobj->ParseTime(_swigarg0)) +static int wxDateTime_ParseTime(wxDateTime *self,const wxString & time) { + const wxChar* rv; + const wxChar* _time = time; + rv = self->ParseTime(_time); + if (rv == NULL) return -1; + return rv - _time; + } static PyObject *_wrap_wxDateTime_ParseTime(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; + int _result; wxDateTime * _arg0; wxString * _arg1; PyObject * _argo0 = 0; @@ -5367,23 +5361,14 @@ static PyObject *_wrap_wxDateTime_ParseTime(PyObject *self, PyObject *args, PyOb } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxDateTime_ParseTime(_arg0,*_arg1)); + _result = (int )wxDateTime_ParseTime(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} _resultobj = Py_BuildValue("i",_result); { if (_obj1) delete _arg1; -} -{ - delete _result; } return _resultobj; } -- 2.45.2