reSWIGged

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

diff --git a/wxPython/src/__windows_rename.i b/wxPython/src/__windows_rename.i
index 6ff078cace620490beee4b49554b865c3b547e2b..fa1b5f7e7914abed177561b90946d70182f3eae8 100644 (file)
--- a/wxPython/src/__windows_rename.i
+++ b/wxPython/src/__windows_rename.i
@@ -113,6 +113,7 @@
 %rename(CHOICEDLG_STYLE)                    wxCHOICEDLG_STYLE;
 %rename(MultiChoiceDialog)                  wxMultiChoiceDialog;
 %rename(SingleChoiceDialog)                 wxSingleChoiceDialog;
+%rename(TextEntryDialogStyle)               wxTextEntryDialogStyle;
 %rename(TextEntryDialog)                    wxTextEntryDialog;
 %rename(PasswordEntryDialog)                wxPasswordEntryDialog;
 %rename(FontData)                           wxFontData;

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index 3e2357f86e70443751812463e4e1cbba7991b1e3..a858064877ad946f78bf0838928ba7e7a4746243 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -2399,6 +2399,12 @@ def ImageFromData(*args, **kwargs):
     val.thisown = 1
     return val
 
+def ImageFromDataWithAlpha(*args, **kwargs):
+    """ImageFromDataWithAlpha(int width, int height, unsigned char data, unsigned char alpha) -> Image"""
+    val = _core_.new_ImageFromDataWithAlpha(*args, **kwargs)
+    val.thisown = 1
+    return val
+
 def Image_CanRead(*args, **kwargs):
     """Image_CanRead(String name) -> bool"""
     return _core_.Image_CanRead(*args, **kwargs)
@@ -10288,6 +10294,8 @@ class GridBagSizer(FlexGridSizer):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
+        self._setOORInfo(self)
+
     def Add(*args, **kwargs):
         """
         Add(self, item, GBPosition pos, GBSpan span=DefaultSpan, int flag=0,

diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp
index fe199b714955eefc1df59831e184836d029e0f17..b28aa0f8e6323b76b9c204814fe119208b5dc001 100644 (file)
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -1256,6 +1256,23 @@ wxImage *new_wxImage(int width,int height,unsigned char *data){
             memcpy(copy, data, width*height*3);
             return new wxImage(width, height, copy, false);
         }
+wxImage *new_wxImage(int width,int height,unsigned char *data,unsigned char *alpha){
+            // Copy the source data so the wxImage can clean it up later
+            unsigned char* dcopy = (unsigned char*)malloc(width*height*3);
+            if (dcopy == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+            }
+            memcpy(dcopy, data, width*height*3);
+            unsigned char* acopy = (unsigned char*)malloc(width*height);
+            if (acopy == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+            }
+            memcpy(acopy, alpha, width*height);
+            
+            return new wxImage(width, height, dcopy, acopy, false);
+        }
 wxSize wxImage_GetSize(wxImage *self){
             wxSize size(self->GetWidth(), self->GetHeight());
             return size;
@@ -9278,6 +9295,44 @@ static PyObject *_wrap_new_ImageFromData(PyObject *, PyObject *args, PyObject *k
 }
 
 
+static PyObject *_wrap_new_ImageFromDataWithAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    int arg1 ;
+    int arg2 ;
+    unsigned char *arg3 = (unsigned char *) 0 ;
+    unsigned char *arg4 = (unsigned char *) 0 ;
+    wxImage *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    char *kwnames[] = {
+        (char *) "width",(char *) "height",(char *) "data",(char *) "alpha", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_ImageFromDataWithAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    arg1 = (int)SWIG_As_int(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg2 = (int)SWIG_As_int(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_unsigned_char,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_unsigned_char,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxImage *)new_wxImage(arg1,arg2,arg3,arg4);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
@@ -41072,6 +41127,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_EmptyImage", (PyCFunction) _wrap_new_EmptyImage, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"new_ImageFromBitmap", (PyCFunction) _wrap_new_ImageFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"new_ImageFromData", (PyCFunction) _wrap_new_ImageFromData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ImageFromDataWithAlpha", (PyCFunction) _wrap_new_ImageFromDataWithAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Image_Create", (PyCFunction) _wrap_Image_Create, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Image_Destroy", (PyCFunction) _wrap_Image_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Image_Scale", (PyCFunction) _wrap_Image_Scale, METH_VARARGS | METH_KEYWORDS, NULL },

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index b136b6030bc12ef0d4ec2fced3c74134379e479b..d6566c8248bd45d70087bc4cce5b9aaf1b875f67 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -1586,6 +1586,8 @@ KILL_BAD_SIGNAL = _misc_.KILL_BAD_SIGNAL
 KILL_ACCESS_DENIED = _misc_.KILL_ACCESS_DENIED
 KILL_NO_PROCESS = _misc_.KILL_NO_PROCESS
 KILL_ERROR = _misc_.KILL_ERROR
+KILL_NOCHILDREN = _misc_.KILL_NOCHILDREN
+KILL_CHILDREN = _misc_.KILL_CHILDREN
 SIGNONE = _misc_.SIGNONE
 SIGHUP = _misc_.SIGHUP
 SIGINT = _misc_.SIGINT
@@ -1607,7 +1609,7 @@ class Process(_core.EvtHandler):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Kill(*args, **kwargs):
-        """Kill(int pid, int sig=SIGTERM) -> int"""
+        """Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""
         return _misc_.Process_Kill(*args, **kwargs)
 
     Kill = staticmethod(Kill)
@@ -1686,7 +1688,7 @@ class ProcessPtr(Process):
 _misc_.Process_swigregister(ProcessPtr)
 
 def Process_Kill(*args, **kwargs):
-    """Process_Kill(int pid, int sig=SIGTERM) -> int"""
+    """Process_Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""
     return _misc_.Process_Kill(*args, **kwargs)
 
 def Process_Exists(*args, **kwargs):
@@ -1735,6 +1737,10 @@ EXEC_MAKE_GROUP_LEADER = _misc_.EXEC_MAKE_GROUP_LEADER
 def Execute(*args, **kwargs):
     """Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long"""
     return _misc_.Execute(*args, **kwargs)
+
+def Kill(*args, **kwargs):
+    """Kill(long pid, int sig=SIGTERM, int rc, int flags=KILL_NOCHILDREN) -> int"""
+    return _misc_.Kill(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 JOYSTICK1 = _misc_.JOYSTICK1

diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index b9c499a917e7dbc15ca19892d1e2dc96cead1f1f..ddd7404ed50ec8f81f771058c4ce23c934cdeb50 100644 (file)
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -234,11 +234,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_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_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_wxFileDataObject swig_types[31] 
 #define  SWIGTYPE_p_wxCustomDataObject swig_types[32] 
 #define  SWIGTYPE_p_wxURLDataObject swig_types[33] 
@@ -277,24 +277,25 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #define  SWIGTYPE_p_wxOutputStream swig_types[66] 
 #define  SWIGTYPE_p_wxDateTime swig_types[67] 
 #define  SWIGTYPE_p_wxPyDropSource swig_types[68] 
-#define  SWIGTYPE_p_wxWindow swig_types[69] 
-#define  SWIGTYPE_p_wxString swig_types[70] 
-#define  SWIGTYPE_p_wxPyProcess swig_types[71] 
-#define  SWIGTYPE_p_wxBitmap swig_types[72] 
-#define  SWIGTYPE_p_wxConfig swig_types[73] 
-#define  SWIGTYPE_p_wxChar swig_types[74] 
-#define  SWIGTYPE_p_wxBusyInfo swig_types[75] 
-#define  SWIGTYPE_p_wxPyDropTarget swig_types[76] 
-#define  SWIGTYPE_p_wxPyTextDropTarget swig_types[77] 
-#define  SWIGTYPE_p_wxPyFileDropTarget swig_types[78] 
-#define  SWIGTYPE_p_wxProcessEvent swig_types[79] 
-#define  SWIGTYPE_p_wxPyLog swig_types[80] 
-#define  SWIGTYPE_p_wxLogNull swig_types[81] 
-#define  SWIGTYPE_p_wxColour 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_wxKillError swig_types[69] 
+#define  SWIGTYPE_p_wxWindow swig_types[70] 
+#define  SWIGTYPE_p_wxString swig_types[71] 
+#define  SWIGTYPE_p_wxPyProcess swig_types[72] 
+#define  SWIGTYPE_p_wxBitmap swig_types[73] 
+#define  SWIGTYPE_p_wxConfig swig_types[74] 
+#define  SWIGTYPE_p_wxChar swig_types[75] 
+#define  SWIGTYPE_p_wxBusyInfo swig_types[76] 
+#define  SWIGTYPE_p_wxPyDropTarget swig_types[77] 
+#define  SWIGTYPE_p_wxPyTextDropTarget swig_types[78] 
+#define  SWIGTYPE_p_wxPyFileDropTarget swig_types[79] 
+#define  SWIGTYPE_p_wxProcessEvent swig_types[80] 
+#define  SWIGTYPE_p_wxPyLog swig_types[81] 
+#define  SWIGTYPE_p_wxLogNull swig_types[82] 
+#define  SWIGTYPE_p_wxColour swig_types[83] 
+#define  SWIGTYPE_p_wxConfigPathChanger swig_types[84] 
+#define  SWIGTYPE_p_wxPyTimer swig_types[85] 
+#define  SWIGTYPE_p_wxDateSpan swig_types[86] 
+static swig_type_info *swig_types[88];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -9355,23 +9356,29 @@ static PyObject *_wrap_Process_Kill(PyObject *, PyObject *args, PyObject *kwargs
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxSIGTERM ;
+    int arg3 = (int) wxKILL_NOCHILDREN ;
     int result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
     char *kwnames[] = {
-        (char *) "pid",(char *) "sig", NULL 
+        (char *) "pid",(char *) "sig",(char *) "flags", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Kill",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Process_Kill",kwnames,&obj0,&obj1,&obj2)) goto fail;
     arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
         arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
+    if (obj2) {
+        arg3 = (int)SWIG_As_int(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2);
+        result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -10079,6 +10086,54 @@ static PyObject *_wrap_Execute(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
+static PyObject *_wrap_Kill(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    long arg1 ;
+    int arg2 = (int) wxSIGTERM ;
+    wxKillError *arg3 = (wxKillError *) 0 ;
+    int arg4 = (int) wxKILL_NOCHILDREN ;
+    int result;
+    wxKillError temp3 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "pid",(char *) "sig",(char *) "flags", NULL 
+    };
+    
+    {
+        arg3 = &temp3; 
+    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Kill",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    arg1 = (long)SWIG_As_long(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj1) {
+        arg2 = (int)SWIG_As_int(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg4 = (int)SWIG_As_int(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)wxKill(arg1,(wxSignal )arg2,arg3,arg4);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_From_int((int)result);
+    {
+        PyObject* o;
+        o = PyInt_FromLong((long) (*arg3));
+        resultobj = t_output_helper(resultobj, o);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_new_Joystick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxJOYSTICK1 ;
@@ -29326,6 +29381,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"ProcessEvent_m_exitcode_get", (PyCFunction) _wrap_ProcessEvent_m_exitcode_get, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"ProcessEvent_swigregister", ProcessEvent_swigregister, METH_VARARGS, NULL },
         { (char *)"Execute", (PyCFunction) _wrap_Execute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Kill", (PyCFunction) _wrap_Kill, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"new_Joystick", (PyCFunction) _wrap_new_Joystick, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"delete_Joystick", (PyCFunction) _wrap_delete_Joystick, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Joystick_GetPosition", (PyCFunction) _wrap_Joystick_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -30406,11 +30462,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}};
@@ -30449,6 +30505,7 @@ static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0
 static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0, 0, 0, 0},{"_p_wxOutputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0, 0, 0, 0},{"_p_wxDateTime", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyDropSource[] = {{"_p_wxPyDropSource", 0, "wxPyDropSource *", 0, 0, 0, 0},{"_p_wxPyDropSource", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxKillError[] = {{"_p_wxKillError", 0, "enum wxKillError *|wxKillError *", 0, 0, 0, 0},{"_p_wxKillError", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyProcess[] = {{"_p_wxPyProcess", 0, "wxPyProcess *", 0, 0, 0, 0},{"_p_wxPyProcess", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -30494,11 +30551,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, 
@@ -30537,6 +30594,7 @@ _swigt__p_wxObject,
 _swigt__p_wxOutputStream, 
 _swigt__p_wxDateTime, 
 _swigt__p_wxPyDropSource, 
+_swigt__p_wxKillError, 
 _swigt__p_wxWindow, 
 _swigt__p_wxString, 
 _swigt__p_wxPyProcess, 
@@ -30724,6 +30782,8 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d,"KILL_ACCESS_DENIED", SWIG_From_int((int)wxKILL_ACCESS_DENIED));
     PyDict_SetItemString(d,"KILL_NO_PROCESS", SWIG_From_int((int)wxKILL_NO_PROCESS));
     PyDict_SetItemString(d,"KILL_ERROR", SWIG_From_int((int)wxKILL_ERROR));
+    PyDict_SetItemString(d,"KILL_NOCHILDREN", SWIG_From_int((int)wxKILL_NOCHILDREN));
+    PyDict_SetItemString(d,"KILL_CHILDREN", SWIG_From_int((int)wxKILL_CHILDREN));
     PyDict_SetItemString(d,"SIGNONE", SWIG_From_int((int)wxSIGNONE));
     PyDict_SetItemString(d,"SIGHUP", SWIG_From_int((int)wxSIGHUP));
     PyDict_SetItemString(d,"SIGINT", SWIG_From_int((int)wxSIGINT));

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index dda373a8ad120aa1ee94d73bd1a4baaa7ed58a66..13fe7eded0ae5cdfb29b70beac67c39257e0bf23 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -2604,6 +2604,7 @@ class SingleChoiceDialogPtr(SingleChoiceDialog):
         self.__class__ = SingleChoiceDialog
 _windows_.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr)
 
+TextEntryDialogStyle = _windows_.TextEntryDialogStyle
 class TextEntryDialog(Dialog):
     """A dialog with text control, [ok] and [cancel] buttons"""
     def __repr__(self):
@@ -2612,7 +2613,7 @@ class TextEntryDialog(Dialog):
         """
         __init__(self, Window parent, String message, String caption=GetTextFromUserPromptStr, 
             String defaultValue=EmptyString, 
-            long style=wxTextEntryDialogStyle, Point pos=DefaultPosition) -> TextEntryDialog
+            long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> TextEntryDialog
 
         Constructor.  Use ShowModal method to show the dialog.
         """
@@ -2654,7 +2655,7 @@ class PasswordEntryDialog(TextEntryDialog):
         """
         __init__(self, Window parent, String message, String caption=GetPasswordFromUserPromptStr, 
             String value=EmptyString, 
-            long style=wxTextEntryDialogStyle, Point pos=DefaultPosition) -> PasswordEntryDialog
+            long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> PasswordEntryDialog
         """
         newobj = _windows_.new_PasswordEntryDialog(*args, **kwargs)
         self.this = newobj.this

diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp
index fa73ba9b246d81ddfb35092184e73b3aaa9a299b..11e5cc1dc59fa0274861b017546cd7b76aa62818 100644 (file)
--- a/wxPython/src/gtk/_windows_wrap.cpp
+++ b/wxPython/src/gtk/_windows_wrap.cpp
@@ -27460,6 +27460,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"GetTextFromUserPromptStr",_wrap_GetTextFromUserPromptStr_get, _wrap_GetTextFromUserPromptStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"MessageBoxCaptionStr",_wrap_MessageBoxCaptionStr_get, _wrap_MessageBoxCaptionStr_set);
     PyDict_SetItemString(d,"CHOICEDLG_STYLE", SWIG_From_int((int)wxCHOICEDLG_STYLE));
+    PyDict_SetItemString(d,"TextEntryDialogStyle", SWIG_From_int((int)wxTextEntryDialogStyle));
     SWIG_addvarlink(SWIG_globals,(char*)"GetPasswordFromUserPromptStr",_wrap_GetPasswordFromUserPromptStr_get, _wrap_GetPasswordFromUserPromptStr_set);
     PyDict_SetItemString(d,"FR_DOWN", SWIG_From_int((int)wxFR_DOWN));
     PyDict_SetItemString(d,"FR_WHOLEWORD", SWIG_From_int((int)wxFR_WHOLEWORD));

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index e53110a378541a135770e87ba23f9ac0a1abe13a..44705304182c4e46799f6b6523cb8713146a38b2 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -674,6 +674,7 @@ wxImageFromStreamMime = wx._core.ImageFromStreamMime
 wxEmptyImage = wx._core.EmptyImage
 wxImageFromBitmap = wx._core.ImageFromBitmap
 wxImageFromData = wx._core.ImageFromData
+wxImageFromDataWithAlpha = wx._core.ImageFromDataWithAlpha
 wxImage_CanRead = wx._core.Image_CanRead
 wxImage_GetImageCount = wx._core.Image_GetImageCount
 wxImage_CanReadStream = wx._core.Image_CanReadStream
@@ -1093,6 +1094,7 @@ wxApp_SetMacExitMenuItemId = wx._core.App_SetMacExitMenuItemId
 wxApp_SetMacHelpMenuTitleName = wx._core.App_SetMacHelpMenuTitleName
 wxApp_GetComCtl32Version = wx._core.App_GetComCtl32Version
 wxPlatform = wx._core.Platform
+wxPlatformInfo = wx._core.PlatformInfo
 wxUSE_UNICODE = wx._core.USE_UNICODE
 wxVERSION_STRING = wx._core.VERSION_STRING
 wxMAJOR_VERSION = wx._core.MAJOR_VERSION

diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py
index b28071202a4b5f1dde1c186c46f33ccfca8f215a..462066fb4378577b753cff27cbb4ad7df4a0d817 100644 (file)
--- a/wxPython/wxPython/_misc.py
+++ b/wxPython/wxPython/_misc.py
@@ -315,6 +315,8 @@ wxKILL_BAD_SIGNAL = wx._misc.KILL_BAD_SIGNAL
 wxKILL_ACCESS_DENIED = wx._misc.KILL_ACCESS_DENIED
 wxKILL_NO_PROCESS = wx._misc.KILL_NO_PROCESS
 wxKILL_ERROR = wx._misc.KILL_ERROR
+wxKILL_NOCHILDREN = wx._misc.KILL_NOCHILDREN
+wxKILL_CHILDREN = wx._misc.KILL_CHILDREN
 wxSIGNONE = wx._misc.SIGNONE
 wxSIGHUP = wx._misc.SIGHUP
 wxSIGINT = wx._misc.SIGINT
@@ -345,6 +347,7 @@ wxEXEC_SYNC = wx._misc.EXEC_SYNC
 wxEXEC_NOHIDE = wx._misc.EXEC_NOHIDE
 wxEXEC_MAKE_GROUP_LEADER = wx._misc.EXEC_MAKE_GROUP_LEADER
 wxExecute = wx._misc.Execute
+wxKill = wx._misc.Kill
 wxJOYSTICK1 = wx._misc.JOYSTICK1
 wxJOYSTICK2 = wx._misc.JOYSTICK2
 wxJOY_BUTTON_ANY = wx._misc.JOY_BUTTON_ANY

diff --git a/wxPython/wxPython/_windows.py b/wxPython/wxPython/_windows.py
index 2d6349a59ff86dc4f0906f3e2f729aabd6853261..2386ac752014f6a5f8fdbbd535ac9293a48a41f1 100644 (file)
--- a/wxPython/wxPython/_windows.py
+++ b/wxPython/wxPython/_windows.py
@@ -213,6 +213,7 @@ wxMultiChoiceDialog = wx._windows.MultiChoiceDialog
 wxMultiChoiceDialogPtr = wx._windows.MultiChoiceDialogPtr
 wxSingleChoiceDialog = wx._windows.SingleChoiceDialog
 wxSingleChoiceDialogPtr = wx._windows.SingleChoiceDialogPtr
+wxTextEntryDialogStyle = wx._windows.TextEntryDialogStyle
 wxTextEntryDialog = wx._windows.TextEntryDialog
 wxTextEntryDialogPtr = wx._windows.TextEntryDialogPtr
 wxGetPasswordFromUserPromptStr = wx._windows.GetPasswordFromUserPromptStr