I forgot the wxSignal enum

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index c80685a978b07bba312a4da14f93d9e04b873f25..d36e1db32636d38bc93bff460cf322a6a8de0a7d 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -763,12 +763,6 @@ public:
 //----------------------------------------------------------------------
 
 
-enum {
-    /* event type */
-    wxEVT_END_PROCESS
-};
-
-
 enum wxKillError
 {
     wxKILL_OK,              // no error
@@ -778,6 +772,37 @@ enum wxKillError
     wxKILL_ERROR            // another, unspecified error
 };
 
+enum wxSignal
+{
+    wxSIGNONE = 0,  // verify if the process exists under Unix
+    wxSIGHUP,
+    wxSIGINT,
+    wxSIGQUIT,
+    wxSIGILL,
+    wxSIGTRAP,
+    wxSIGABRT,
+    wxSIGIOT = wxSIGABRT,   // another name
+    wxSIGEMT,
+    wxSIGFPE,
+    wxSIGKILL,
+    wxSIGBUS,
+    wxSIGSEGV,
+    wxSIGSYS,
+    wxSIGPIPE,
+    wxSIGALRM,
+    wxSIGTERM
+
+    // further signals are different in meaning between different Unix systems
+};
+
+
+
+enum {
+    /* event type */
+    wxEVT_END_PROCESS
+};
+
+
 
 class wxProcessEvent : public wxEvent {
 public:

diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp
index 3133bab331e35747deacd2dabc27fbd0cb0a708b..4203ed3531db39ad61782ab3e9f3b0982526d160 100644 (file)
--- a/wxPython/src/msw/misc2.cpp
+++ b/wxPython/src/msw/misc2.cpp
@@ -6108,23 +6108,15 @@ static PyObject *_wrap_wxProcess_Kill(PyObject *self, PyObject *args, PyObject *
     PyObject * _resultobj;
     wxKillError  _result;
     int  _arg0;
-    wxSignal * _arg1 = (wxSignal *) &wxSIGTERM;
-    PyObject * _argo1 = 0;
+    wxSignal  _arg1 = (wxSignal ) (wxSIGTERM);
     char *_kwnames[] = { "pid","sig", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i|O:wxProcess_Kill",_kwnames,&_arg0,&_argo1)) 
-        return NULL;
-    if (_argo1) {
-        if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSignal_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxProcess_Kill. Expected _wxSignal_p.");
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i|i:wxProcess_Kill",_kwnames,&_arg0,&_arg1)) 
         return NULL;
-        }
-    }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (wxKillError )wxPyProcess::Kill(_arg0,*_arg1);
+    _result = (wxKillError )wxPyProcess::Kill(_arg0,_arg1);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
@@ -10893,12 +10885,29 @@ SWIGEXPORT(void) initmisc2c() {
         PyDict_SetItemString(d,"wxTraceResAlloc", PyInt_FromLong((long) wxTraceResAlloc));
         PyDict_SetItemString(d,"wxTraceRefCount", PyInt_FromLong((long) wxTraceRefCount));
         PyDict_SetItemString(d,"wxTraceOleCalls", PyInt_FromLong((long) wxTraceOleCalls));
-        PyDict_SetItemString(d,"wxEVT_END_PROCESS", PyInt_FromLong((long) wxEVT_END_PROCESS));
         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));
         PyDict_SetItemString(d,"wxEXEC_NOHIDE", PyInt_FromLong((long) wxEXEC_NOHIDE));

diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py
index 2ca80eaf0f585301fe214089beea2d6b93190f7f..5d6dbb22f3f6a9556ea01743494de33960bdd47d 100644 (file)
--- a/wxPython/src/msw/misc2.py
+++ b/wxPython/src/msw/misc2.py
@@ -1343,12 +1343,29 @@ wxTraceMessages = misc2c.wxTraceMessages
 wxTraceResAlloc = misc2c.wxTraceResAlloc
 wxTraceRefCount = misc2c.wxTraceRefCount
 wxTraceOleCalls = misc2c.wxTraceOleCalls
-wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS
 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
 wxEXEC_NOHIDE = misc2c.wxEXEC_NOHIDE