Reverted wxString members to const wxChar * for struct BugsGridData

[wxWidgets.git] / utils / wxPython / src / msw / misc.cpp

diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp
index 580a2ca5ac83126ded321d84e3e444371a6bd60c..5f1b70a7335d50a850c9e49f1f152ab2cb462abd 100644 (file)
--- a/utils/wxPython/src/msw/misc.cpp
+++ b/utils/wxPython/src/msw/misc.cpp
@@ -107,6 +107,27 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 

+    PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) {
+        wxRegion  reg1(*r1);
+        wxRegion  reg2(*r2);
+        wxRect    dest(0,0,0,0);
+        PyObject* obj;
+
+        reg1.Intersect(reg2);
+        dest = reg1.GetBox();
+
+        if (dest != wxRect(0,0,0,0)) {
+            bool doSave = wxPyRestoreThread();
+            wxRect* newRect = new wxRect(dest);
+            obj = wxPyConstructObject((void*)newRect, "wxRect");
+            PyObject_SetAttrString(obj, "thisown", PyInt_FromLong(1));
+            wxPySaveThread(doSave);
+            return obj;
+        }
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+

     char* wxGetResource(char *section, char *entry, char *file = NULL) {
         char * retval;
         wxGetResource(section, entry, &retval, file);
     char* wxGetResource(char *section, char *entry, char *file = NULL) {
         char * retval;
         wxGetResource(section, entry, &retval, file);


@@ -115,6 +136,41 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif

+static PyObject *_wrap_wxIntersectRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxRect * _arg0;
+    wxRect * _arg1;
+    wxRect  temp;
+    PyObject * _obj0 = 0;
+    wxRect  temp0;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "r1","r2", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxIntersectRect",_kwnames,&_obj0,&_obj1)) 
+        return NULL;
+{
+    _arg0 = &temp;
+    if (! wxRect_helper(_obj0, &_arg0))
+        return NULL;
+}
+{
+    _arg1 = &temp0;
+    if (! wxRect_helper(_obj1, &_arg1))
+        return NULL;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (PyObject *)wxIntersectRect(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+

 static PyObject *_wrap_wxNewId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
 static PyObject *_wrap_wxNewId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;


@@ -260,13 +316,12 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args, PyObject *kwarg
     PyObject * _resultobj;
     long  _result;
     wxString * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxString * _arg0;

-    bool  _arg1 = (bool ) FALSE;
+    int  _arg1 = (int ) FALSE;

     PyObject * _obj0 = 0;
     PyObject * _obj0 = 0;

-    int tempbool1 = (int) FALSE;

     char *_kwnames[] = { "command","sync", NULL };
 
     self = self;
     char *_kwnames[] = { "command","sync", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxExecute",_kwnames,&_obj0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxExecute",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     if (!PyString_Check(_obj0)) {
         return NULL;
 {
     if (!PyString_Check(_obj0)) {


@@ -275,7 +330,6 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args, PyObject *kwarg
     }
     _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }
     }
     _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }

-    _arg1 = (bool ) tempbool1;

 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (long )wxExecute(*_arg0,_arg1);
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (long )wxExecute(*_arg0,_arg1);


@@ -394,7 +448,7 @@ static PyObject *_wrap_wxNow(PyObject *self, PyObject *args, PyObject *kwargs) {
 
     wxPy_END_ALLOW_THREADS;
 }{
 
     wxPy_END_ALLOW_THREADS;
 }{

-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());

 }
 {
     delete _result;
 }
 {
     delete _result;


@@ -579,6 +633,41 @@ static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args, PyObject *k
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+static PyObject *_wrap_wxStripMenuCodes(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxString * _arg0;
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "in", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStripMenuCodes",_kwnames,&_obj0)) 
+        return NULL;
+{
+    if (!PyString_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxStripMenuCodes(*_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
+}
+{
+    if (_obj0)
+        delete _arg0;
+}
+{
+    delete _result;
+}
+    return _resultobj;
+}
+

 #define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
 static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
 static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;


@@ -1407,15 +1496,15 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
 static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;

-    long  _arg0 = (long ) 0;
-    long  _arg1 = (long ) 0;
-    long  _arg2 = (long ) 0;
-    long  _arg3 = (long ) 0;
+    int  _arg0 = (int ) 0;
+    int  _arg1 = (int ) 0;
+    int  _arg2 = (int ) 0;
+    int  _arg3 = (int ) 0;

     char *_kwnames[] = { "x","y","w","h", NULL };
     char _ptemp[128];
 
     self = self;
     char *_kwnames[] = { "x","y","w","h", NULL };
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|llll:new_wxRect",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxRect",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;


@@ -1461,7 +1550,7 @@ static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args, PyObject *k
 #define wxRect_GetX(_swigobj)  (_swigobj->GetX())
 static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxRect_GetX(_swigobj)  (_swigobj->GetX())
 static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1477,10 +1566,10 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwa
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetX(_arg0);
+        _result = (int )wxRect_GetX(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1488,13 +1577,13 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
 static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","X", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","X", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetX",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetX",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -1514,7 +1603,7 @@ static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args, PyObject *kwa
 #define wxRect_GetY(_swigobj)  (_swigobj->GetY())
 static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxRect_GetY(_swigobj)  (_swigobj->GetY())
 static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1530,10 +1619,10 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwa
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetY(_arg0);
+        _result = (int )wxRect_GetY(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1541,13 +1630,13 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
 static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","Y", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","Y", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetY",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetY",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -1567,7 +1656,7 @@ static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args, PyObject *kwa
 #define wxRect_GetWidth(_swigobj)  (_swigobj->GetWidth())
 static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxRect_GetWidth(_swigobj)  (_swigobj->GetWidth())
 static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1583,10 +1672,10 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetWidth(_arg0);
+        _result = (int )wxRect_GetWidth(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1594,13 +1683,13 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
 static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","w", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","w", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetWidth",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetWidth",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -1620,7 +1709,7 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args, PyObject
 #define wxRect_GetHeight(_swigobj)  (_swigobj->GetHeight())
 static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxRect_GetHeight(_swigobj)  (_swigobj->GetHeight())
 static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1636,10 +1725,10 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetHeight(_arg0);
+        _result = (int )wxRect_GetHeight(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -1647,13 +1736,13 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
 static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","h", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","h", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetHeight",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetHeight",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -1729,7 +1818,7 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args, PyObject *
 #define wxRect_GetLeft(_swigobj)  (_swigobj->GetLeft())
 static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxRect_GetLeft(_swigobj)  (_swigobj->GetLeft())
 static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1745,17 +1834,17 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args, PyObject *
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetLeft(_arg0);
+        _result = (int )wxRect_GetLeft(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxRect_GetTop(_swigobj)  (_swigobj->GetTop())
 static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     return _resultobj;
 }
 
 #define wxRect_GetTop(_swigobj)  (_swigobj->GetTop())
 static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1771,17 +1860,17 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args, PyObject *k
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetTop(_arg0);
+        _result = (int )wxRect_GetTop(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxRect_GetBottom(_swigobj)  (_swigobj->GetBottom())
 static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     return _resultobj;
 }
 
 #define wxRect_GetBottom(_swigobj)  (_swigobj->GetBottom())
 static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1797,17 +1886,17 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args, PyObject
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetBottom(_arg0);
+        _result = (int )wxRect_GetBottom(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxRect_GetRight(_swigobj)  (_swigobj->GetRight())
 static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     return _resultobj;
 }
 
 #define wxRect_GetRight(_swigobj)  (_swigobj->GetRight())
 static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1823,25 +1912,133 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args, PyObject
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_GetRight(_arg0);
+        _result = (int )wxRect_GetRight(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRect_SetLeft(_swigobj,_swigarg0)  (_swigobj->SetLeft(_swigarg0))
+static PyObject *_wrap_wxRect_SetLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRect * _arg0;
+    int  _arg1;
+    wxRect  temp;
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "self","left", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetLeft",_kwnames,&_obj0,&_arg1)) 
+        return NULL;
+{
+    _arg0 = &temp;
+    if (! wxRect_helper(_obj0, &_arg0))
+        return NULL;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxRect_SetLeft(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxRect_SetRight(_swigobj,_swigarg0)  (_swigobj->SetRight(_swigarg0))
+static PyObject *_wrap_wxRect_SetRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRect * _arg0;
+    int  _arg1;
+    wxRect  temp;
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "self","right", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetRight",_kwnames,&_obj0,&_arg1)) 
+        return NULL;
+{
+    _arg0 = &temp;
+    if (! wxRect_helper(_obj0, &_arg0))
+        return NULL;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxRect_SetRight(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxRect_SetTop(_swigobj,_swigarg0)  (_swigobj->SetTop(_swigarg0))
+static PyObject *_wrap_wxRect_SetTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRect * _arg0;
+    int  _arg1;
+    wxRect  temp;
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "self","top", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetTop",_kwnames,&_obj0,&_arg1)) 
+        return NULL;
+{
+    _arg0 = &temp;
+    if (! wxRect_helper(_obj0, &_arg0))
+        return NULL;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxRect_SetTop(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxRect_SetBottom(_swigobj,_swigarg0)  (_swigobj->SetBottom(_swigarg0))
+static PyObject *_wrap_wxRect_SetBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRect * _arg0;
+    int  _arg1;
+    wxRect  temp;
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "self","bottom", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_SetBottom",_kwnames,&_obj0,&_arg1)) 
+        return NULL;
+{
+    _arg0 = &temp;
+    if (! wxRect_helper(_obj0, &_arg0))
+        return NULL;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxRect_SetBottom(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
 #define wxRect_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
 static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     return _resultobj;
 }
 
 #define wxRect_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
 static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","x", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","x", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_x_set",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_x_set",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -1850,17 +2047,17 @@ static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args, PyObject *kw
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_x_set(_arg0,_arg1);
+        _result = (int )wxRect_x_set(_arg0,_arg1);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxRect_x_get(_swigobj) ((long ) _swigobj->x)
+#define wxRect_x_get(_swigobj) ((int ) _swigobj->x)

 static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1876,25 +2073,25 @@ static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args, PyObject *kw
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_x_get(_arg0);
+        _result = (int )wxRect_x_get(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxRect_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)
 static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     return _resultobj;
 }
 
 #define wxRect_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)
 static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","y", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","y", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_y_set",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_y_set",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -1903,17 +2100,17 @@ static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args, PyObject *kw
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_y_set(_arg0,_arg1);
+        _result = (int )wxRect_y_set(_arg0,_arg1);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxRect_y_get(_swigobj) ((long ) _swigobj->y)
+#define wxRect_y_get(_swigobj) ((int ) _swigobj->y)

 static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1929,25 +2126,25 @@ static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args, PyObject *kw
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_y_get(_arg0);
+        _result = (int )wxRect_y_get(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxRect_width_set(_swigobj,_swigval) (_swigobj->width = _swigval,_swigval)
 static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     return _resultobj;
 }
 
 #define wxRect_width_set(_swigobj,_swigval) (_swigobj->width = _swigval,_swigval)
 static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","width", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","width", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_width_set",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_width_set",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -1956,17 +2153,17 @@ static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args, PyObject
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_width_set(_arg0,_arg1);
+        _result = (int )wxRect_width_set(_arg0,_arg1);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxRect_width_get(_swigobj) ((long ) _swigobj->width)
+#define wxRect_width_get(_swigobj) ((int ) _swigobj->width)

 static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -1982,25 +2179,25 @@ static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args, PyObject
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_width_get(_arg0);
+        _result = (int )wxRect_width_get(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
 #define wxRect_height_set(_swigobj,_swigval) (_swigobj->height = _swigval,_swigval)
 static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     return _resultobj;
 }
 
 #define wxRect_height_set(_swigobj,_swigval) (_swigobj->height = _swigval,_swigval)
 static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect * _arg0;

-    long  _arg1;
+    int  _arg1;

     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","height", NULL };
 
     self = self;
     wxRect  temp;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "self","height", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_height_set",_kwnames,&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRect_height_set",_kwnames,&_obj0,&_arg1)) 

         return NULL;
 {
     _arg0 = &temp;
         return NULL;
 {
     _arg0 = &temp;


@@ -2009,17 +2206,17 @@ static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args, PyObjec
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_height_set(_arg0,_arg1);
+        _result = (int )wxRect_height_set(_arg0,_arg1);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxRect_height_get(_swigobj) ((long ) _swigobj->height)
+#define wxRect_height_get(_swigobj) ((int ) _swigobj->height)

 static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

-    long  _result;
+    int  _result;

     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;
     wxRect * _arg0;
     wxRect  temp;
     PyObject * _obj0 = 0;


@@ -2035,10 +2232,10 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args, PyObjec
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (long )wxRect_height_get(_arg0);
+        _result = (int )wxRect_height_get(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 
     wxPy_END_ALLOW_THREADS;

-}    _resultobj = Py_BuildValue("l",_result);
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -2134,8 +2331,8 @@ static PyObject *_wrap_delete_wxPyTimer(PyObject *self, PyObject *args, PyObject
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxPyTimer_Interval(_swigobj)  (_swigobj->Interval())
-static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxPyTimer_GetInterval(_swigobj)  (_swigobj->GetInterval())
+static PyObject *_wrap_wxPyTimer_GetInterval(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxPyTimer * _arg0;
     PyObject * _resultobj;
     int  _result;
     wxPyTimer * _arg0;


@@ -2143,18 +2340,45 @@ static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args, PyObje
     char *_kwnames[] = { "self", NULL };
 
     self = self;
     char *_kwnames[] = { "self", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyTimer_Interval",_kwnames,&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyTimer_GetInterval",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_GetInterval. Expected _wxPyTimer_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxPyTimer_GetInterval(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxPyTimer_IsOneShot(_swigobj)  (_swigobj->IsOneShot())
+static PyObject *_wrap_wxPyTimer_IsOneShot(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxPyTimer * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyTimer_IsOneShot",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTimer_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_Interval. Expected _wxPyTimer_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyTimer_IsOneShot. Expected _wxPyTimer_p.");

         return NULL;
         }
     }
 {
     wxPy_BEGIN_ALLOW_THREADS;
         return NULL;
         }
     }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (int )wxPyTimer_Interval(_arg0);
+        _result = (bool )wxPyTimer_IsOneShot(_arg0);

 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);


@@ -3038,6 +3262,37 @@ static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args, PyO
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxRegion_ContainsRectDim(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Contains(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_wxRegion_ContainsRectDim(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRegionContain  _result;
+    wxRegion * _arg0;
+    long  _arg1;
+    long  _arg2;
+    long  _arg3;
+    long  _arg4;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","w","h", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxRegion_ContainsRectDim",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsRectDim. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxRegionContain )wxRegion_ContainsRectDim(_arg0,_arg1,_arg2,_arg3,_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxRegion_GetBox(_swigobj)  (_swigobj->GetBox())
 static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxRegion_GetBox(_swigobj)  (_swigobj->GetBox())
 static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;


@@ -3067,8 +3322,39 @@ static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args, PyObject
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxRegion_Intersect(_swigobj,_swigarg0)  (_swigobj->Intersect(_swigarg0))
+#define wxRegion_Intersect(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Intersect(_swigarg0,_swigarg1,_swigarg2,_swigarg3))

 static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {
 static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {

+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    long  _arg1;
+    long  _arg2;
+    long  _arg3;
+    long  _arg4;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","width","height", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxRegion_Intersect",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Intersect. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_Intersect(_arg0,_arg1,_arg2,_arg3,_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_IntersectRect(_swigobj,_swigarg0)  (_swigobj->Intersect(_swigarg0))
+static PyObject *_wrap_wxRegion_IntersectRect(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;


@@ -3079,12 +3365,12 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObje
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Intersect",_kwnames,&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_IntersectRect",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Intersect. Expected _wxRegion_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_IntersectRect. Expected _wxRegion_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -3095,7 +3381,43 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObje
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (bool )wxRegion_Intersect(_arg0,*_arg1);
+        _result = (bool )wxRegion_IntersectRect(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_IntersectRegion(_swigobj,_swigarg0)  (_swigobj->Intersect(_swigarg0))
+static PyObject *_wrap_wxRegion_IntersectRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRegion * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","region", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_IntersectRegion",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_IntersectRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_IntersectRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_IntersectRegion(_arg0,*_arg1);

 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);


@@ -3129,8 +3451,39 @@ static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args, PyObject
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxRegion_Subtract(_swigobj,_swigarg0)  (_swigobj->Subtract(_swigarg0))
-static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxRegion_Union(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Union(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    long  _arg1;
+    long  _arg2;
+    long  _arg3;
+    long  _arg4;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","width","height", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxRegion_Union",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Union. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_Union(_arg0,_arg1,_arg2,_arg3,_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_UnionRect(_swigobj,_swigarg0)  (_swigobj->Union(_swigarg0))
+static PyObject *_wrap_wxRegion_UnionRect(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;


@@ -3141,12 +3494,12 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObjec
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Subtract",_kwnames,&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_UnionRect",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Subtract. Expected _wxRegion_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_UnionRect. Expected _wxRegion_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -3157,15 +3510,82 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObjec
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (bool )wxRegion_Subtract(_arg0,*_arg1);
+        _result = (bool )wxRegion_UnionRect(_arg0,*_arg1);

 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 

-#define wxRegion_Union(_swigobj,_swigarg0)  (_swigobj->Union(_swigarg0))
-static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxRegion_UnionRegion(_swigobj,_swigarg0)  (_swigobj->Union(_swigarg0))
+static PyObject *_wrap_wxRegion_UnionRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRegion * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","region", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_UnionRegion",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_UnionRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_UnionRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_UnionRegion(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_Subtract(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Subtract(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    long  _arg1;
+    long  _arg2;
+    long  _arg3;
+    long  _arg4;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","width","height", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxRegion_Subtract",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Subtract. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_Subtract(_arg0,_arg1,_arg2,_arg3,_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_SubtractRect(_swigobj,_swigarg0)  (_swigobj->Subtract(_swigarg0))
+static PyObject *_wrap_wxRegion_SubtractRect(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;


@@ -3176,12 +3596,12 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject *
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Union",_kwnames,&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_SubtractRect",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Union. Expected _wxRegion_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_SubtractRect. Expected _wxRegion_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -3192,15 +3612,82 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject *
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (bool )wxRegion_Union(_arg0,*_arg1);
+        _result = (bool )wxRegion_SubtractRect(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_SubtractRegion(_swigobj,_swigarg0)  (_swigobj->Subtract(_swigarg0))
+static PyObject *_wrap_wxRegion_SubtractRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRegion * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","region", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_SubtractRegion",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_SubtractRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_SubtractRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_SubtractRegion(_arg0,*_arg1);

 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 

-#define wxRegion_Xor(_swigobj,_swigarg0)  (_swigobj->Xor(_swigarg0))
+#define wxRegion_Xor(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Xor(_swigarg0,_swigarg1,_swigarg2,_swigarg3))

 static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kwargs) {
 static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kwargs) {

+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    long  _arg1;
+    long  _arg2;
+    long  _arg3;
+    long  _arg4;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","width","height", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxRegion_Xor",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Xor. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_Xor(_arg0,_arg1,_arg2,_arg3,_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_XorRect(_swigobj,_swigarg0)  (_swigobj->Xor(_swigarg0))
+static PyObject *_wrap_wxRegion_XorRect(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;


@@ -3211,12 +3698,12 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kw
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
     char *_kwnames[] = { "self","rect", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Xor",_kwnames,&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_XorRect",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Xor. Expected _wxRegion_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_XorRect. Expected _wxRegion_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -3227,7 +3714,43 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kw
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;

-        _result = (bool )wxRegion_Xor(_arg0,*_arg1);
+        _result = (bool )wxRegion_XorRect(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_XorRegion(_swigobj,_swigarg0)  (_swigobj->Xor(_swigarg0))
+static PyObject *_wrap_wxRegion_XorRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRegion * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","region", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_XorRegion",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_XorRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_XorRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxRegion_XorRegion(_arg0,*_arg1);

 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);


@@ -3742,7 +4265,7 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args, Py
     int  _arg0;
     wxAcceleratorEntry * _arg1;
     PyObject * _obj1 = 0;
     int  _arg0;
     wxAcceleratorEntry * _arg1;
     PyObject * _obj1 = 0;

-    char *_kwnames[] = { "LIST", NULL };
+    char *_kwnames[] = { "choices", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;


@@ -3896,12 +4419,21 @@ static PyMethodDef misccMethods[] = {
         { "wxRegionIterator_GetX", (PyCFunction) _wrap_wxRegionIterator_GetX, METH_VARARGS | METH_KEYWORDS },
         { "delete_wxRegionIterator", (PyCFunction) _wrap_delete_wxRegionIterator, METH_VARARGS | METH_KEYWORDS },
         { "new_wxRegionIterator", (PyCFunction) _wrap_new_wxRegionIterator, METH_VARARGS | METH_KEYWORDS },
         { "wxRegionIterator_GetX", (PyCFunction) _wrap_wxRegionIterator_GetX, METH_VARARGS | METH_KEYWORDS },
         { "delete_wxRegionIterator", (PyCFunction) _wrap_delete_wxRegionIterator, METH_VARARGS | METH_KEYWORDS },
         { "new_wxRegionIterator", (PyCFunction) _wrap_new_wxRegionIterator, METH_VARARGS | METH_KEYWORDS },

+        { "wxRegion_XorRegion", (PyCFunction) _wrap_wxRegion_XorRegion, METH_VARARGS | METH_KEYWORDS },
+        { "wxRegion_XorRect", (PyCFunction) _wrap_wxRegion_XorRect, METH_VARARGS | METH_KEYWORDS },

         { "wxRegion_Xor", (PyCFunction) _wrap_wxRegion_Xor, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_Xor", (PyCFunction) _wrap_wxRegion_Xor, METH_VARARGS | METH_KEYWORDS },

-        { "wxRegion_Union", (PyCFunction) _wrap_wxRegion_Union, METH_VARARGS | METH_KEYWORDS },
+        { "wxRegion_SubtractRegion", (PyCFunction) _wrap_wxRegion_SubtractRegion, METH_VARARGS | METH_KEYWORDS },
+        { "wxRegion_SubtractRect", (PyCFunction) _wrap_wxRegion_SubtractRect, METH_VARARGS | METH_KEYWORDS },

         { "wxRegion_Subtract", (PyCFunction) _wrap_wxRegion_Subtract, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_Subtract", (PyCFunction) _wrap_wxRegion_Subtract, METH_VARARGS | METH_KEYWORDS },

+        { "wxRegion_UnionRegion", (PyCFunction) _wrap_wxRegion_UnionRegion, METH_VARARGS | METH_KEYWORDS },
+        { "wxRegion_UnionRect", (PyCFunction) _wrap_wxRegion_UnionRect, METH_VARARGS | METH_KEYWORDS },
+        { "wxRegion_Union", (PyCFunction) _wrap_wxRegion_Union, METH_VARARGS | METH_KEYWORDS },

         { "wxRegion_IsEmpty", (PyCFunction) _wrap_wxRegion_IsEmpty, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_IsEmpty", (PyCFunction) _wrap_wxRegion_IsEmpty, METH_VARARGS | METH_KEYWORDS },

+        { "wxRegion_IntersectRegion", (PyCFunction) _wrap_wxRegion_IntersectRegion, METH_VARARGS | METH_KEYWORDS },
+        { "wxRegion_IntersectRect", (PyCFunction) _wrap_wxRegion_IntersectRect, METH_VARARGS | METH_KEYWORDS },

         { "wxRegion_Intersect", (PyCFunction) _wrap_wxRegion_Intersect, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_GetBox", (PyCFunction) _wrap_wxRegion_GetBox, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_Intersect", (PyCFunction) _wrap_wxRegion_Intersect, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_GetBox", (PyCFunction) _wrap_wxRegion_GetBox, METH_VARARGS | METH_KEYWORDS },

+        { "wxRegion_ContainsRectDim", (PyCFunction) _wrap_wxRegion_ContainsRectDim, METH_VARARGS | METH_KEYWORDS },

         { "wxRegion_ContainsRect", (PyCFunction) _wrap_wxRegion_ContainsRect, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_ContainsPoint", (PyCFunction) _wrap_wxRegion_ContainsPoint, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_Contains", (PyCFunction) _wrap_wxRegion_Contains, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_ContainsRect", (PyCFunction) _wrap_wxRegion_ContainsRect, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_ContainsPoint", (PyCFunction) _wrap_wxRegion_ContainsPoint, METH_VARARGS | METH_KEYWORDS },
         { "wxRegion_Contains", (PyCFunction) _wrap_wxRegion_Contains, METH_VARARGS | METH_KEYWORDS },


@@ -3929,7 +4461,8 @@ static PyMethodDef misccMethods[] = {
         { "wxIndividualLayoutConstraint_Above", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS },
         { "wxPyTimer_Stop", (PyCFunction) _wrap_wxPyTimer_Stop, METH_VARARGS | METH_KEYWORDS },
         { "wxPyTimer_Start", (PyCFunction) _wrap_wxPyTimer_Start, METH_VARARGS | METH_KEYWORDS },
         { "wxIndividualLayoutConstraint_Above", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS },
         { "wxPyTimer_Stop", (PyCFunction) _wrap_wxPyTimer_Stop, METH_VARARGS | METH_KEYWORDS },
         { "wxPyTimer_Start", (PyCFunction) _wrap_wxPyTimer_Start, METH_VARARGS | METH_KEYWORDS },

-        { "wxPyTimer_Interval", (PyCFunction) _wrap_wxPyTimer_Interval, METH_VARARGS | METH_KEYWORDS },
+        { "wxPyTimer_IsOneShot", (PyCFunction) _wrap_wxPyTimer_IsOneShot, METH_VARARGS | METH_KEYWORDS },
+        { "wxPyTimer_GetInterval", (PyCFunction) _wrap_wxPyTimer_GetInterval, METH_VARARGS | METH_KEYWORDS },

         { "delete_wxPyTimer", (PyCFunction) _wrap_delete_wxPyTimer, METH_VARARGS | METH_KEYWORDS },
         { "new_wxPyTimer", (PyCFunction) _wrap_new_wxPyTimer, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_asTuple", (PyCFunction) _wrap_wxRect_asTuple, METH_VARARGS | METH_KEYWORDS },
         { "delete_wxPyTimer", (PyCFunction) _wrap_delete_wxPyTimer, METH_VARARGS | METH_KEYWORDS },
         { "new_wxPyTimer", (PyCFunction) _wrap_new_wxPyTimer, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_asTuple", (PyCFunction) _wrap_wxRect_asTuple, METH_VARARGS | METH_KEYWORDS },


@@ -3941,6 +4474,10 @@ static PyMethodDef misccMethods[] = {
         { "wxRect_y_set", (PyCFunction) _wrap_wxRect_y_set, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_x_get", (PyCFunction) _wrap_wxRect_x_get, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_x_set", (PyCFunction) _wrap_wxRect_x_set, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_y_set", (PyCFunction) _wrap_wxRect_y_set, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_x_get", (PyCFunction) _wrap_wxRect_x_get, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_x_set", (PyCFunction) _wrap_wxRect_x_set, METH_VARARGS | METH_KEYWORDS },

+        { "wxRect_SetBottom", (PyCFunction) _wrap_wxRect_SetBottom, METH_VARARGS | METH_KEYWORDS },
+        { "wxRect_SetTop", (PyCFunction) _wrap_wxRect_SetTop, METH_VARARGS | METH_KEYWORDS },
+        { "wxRect_SetRight", (PyCFunction) _wrap_wxRect_SetRight, METH_VARARGS | METH_KEYWORDS },
+        { "wxRect_SetLeft", (PyCFunction) _wrap_wxRect_SetLeft, METH_VARARGS | METH_KEYWORDS },

         { "wxRect_GetRight", (PyCFunction) _wrap_wxRect_GetRight, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_GetBottom", (PyCFunction) _wrap_wxRect_GetBottom, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_GetTop", (PyCFunction) _wrap_wxRect_GetTop, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_GetRight", (PyCFunction) _wrap_wxRect_GetRight, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_GetBottom", (PyCFunction) _wrap_wxRect_GetBottom, METH_VARARGS | METH_KEYWORDS },
         { "wxRect_GetTop", (PyCFunction) _wrap_wxRect_GetTop, METH_VARARGS | METH_KEYWORDS },


@@ -3991,6 +4528,7 @@ static PyMethodDef misccMethods[] = {
         { "wxSize_y_set", (PyCFunction) _wrap_wxSize_y_set, METH_VARARGS | METH_KEYWORDS },
         { "wxSize_x_get", (PyCFunction) _wrap_wxSize_x_get, METH_VARARGS | METH_KEYWORDS },
         { "wxSize_x_set", (PyCFunction) _wrap_wxSize_x_set, METH_VARARGS | METH_KEYWORDS },
         { "wxSize_y_set", (PyCFunction) _wrap_wxSize_y_set, METH_VARARGS | METH_KEYWORDS },
         { "wxSize_x_get", (PyCFunction) _wrap_wxSize_x_get, METH_VARARGS | METH_KEYWORDS },
         { "wxSize_x_set", (PyCFunction) _wrap_wxSize_x_set, METH_VARARGS | METH_KEYWORDS },

+        { "wxStripMenuCodes", (PyCFunction) _wrap_wxStripMenuCodes, METH_VARARGS | METH_KEYWORDS },

         { "wxGetResource", (PyCFunction) _wrap_wxGetResource, METH_VARARGS | METH_KEYWORDS },
         { "wxEnableTopLevelWindows", (PyCFunction) _wrap_wxEnableTopLevelWindows, METH_VARARGS | METH_KEYWORDS },
         { "wxSafeYield", (PyCFunction) _wrap_wxSafeYield, METH_VARARGS | METH_KEYWORDS },
         { "wxGetResource", (PyCFunction) _wrap_wxGetResource, METH_VARARGS | METH_KEYWORDS },
         { "wxEnableTopLevelWindows", (PyCFunction) _wrap_wxEnableTopLevelWindows, METH_VARARGS | METH_KEYWORDS },
         { "wxSafeYield", (PyCFunction) _wrap_wxSafeYield, METH_VARARGS | METH_KEYWORDS },


@@ -4012,6 +4550,7 @@ static PyMethodDef misccMethods[] = {
         { "NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS },
         { "wxRegisterId", (PyCFunction) _wrap_wxRegisterId, METH_VARARGS | METH_KEYWORDS },
         { "wxNewId", (PyCFunction) _wrap_wxNewId, METH_VARARGS | METH_KEYWORDS },
         { "NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS },
         { "wxRegisterId", (PyCFunction) _wrap_wxRegisterId, METH_VARARGS | METH_KEYWORDS },
         { "wxNewId", (PyCFunction) _wrap_wxNewId, METH_VARARGS | METH_KEYWORDS },

+        { "wxIntersectRect", (PyCFunction) _wrap_wxIntersectRect, METH_VARARGS | METH_KEYWORDS },

         { NULL, NULL }
 };
 #ifdef __cplusplus
         { NULL, NULL }
 };
 #ifdef __cplusplus


@@ -4023,6 +4562,7 @@ static PyMethodDef misccMethods[] = {
 static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
     { "_signed_long","_long",0},
 static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
     { "_signed_long","_long",0},

+    { "_wxPrintQuality","_wxCoord",0},

     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
     { "_wxPrintQuality","_unsigned_int",0},
     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
     { "_wxPrintQuality","_unsigned_int",0},


@@ -4036,12 +4576,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},

+    { "_size_t","_wxCoord",0},

     { "_size_t","_wxPrintQuality",0},
     { "_size_t","_unsigned_int",0},
     { "_size_t","_int",0},
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
     { "_size_t","_wxPrintQuality",0},
     { "_size_t","_unsigned_int",0},
     { "_size_t","_int",0},
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},

+    { "_uint","_wxCoord",0},

     { "_uint","_wxPrintQuality",0},
     { "_uint","_size_t",0},
     { "_uint","_unsigned_int",0},
     { "_uint","_wxPrintQuality",0},
     { "_uint","_size_t",0},
     { "_uint","_unsigned_int",0},


@@ -4051,6 +4593,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPoint","_class_wxPoint",0},
     { "_wxPyTimer","_class_wxPyTimer",0},
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_wxPoint","_class_wxPoint",0},
     { "_wxPyTimer","_class_wxPyTimer",0},
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},

+    { "_EBool","_wxCoord",0},

     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
     { "_EBool","_int",0},
     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
     { "_EBool","_int",0},


@@ -4060,6 +4603,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxRect","_wxRect",0},
     { "_class_wxPyTimer","_wxPyTimer",0},
     { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
     { "_class_wxRect","_wxRect",0},
     { "_class_wxPyTimer","_wxPyTimer",0},
     { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},

+    { "_signed_int","_wxCoord",0},

     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxWindowID",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxWindowID",0},


@@ -4077,6 +4621,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_short","_short",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_unsigned_char","_byte",0},
     { "_signed_short","_short",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_unsigned_char","_byte",0},

+    { "_unsigned_int","_wxCoord",0},

     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_size_t",0},
     { "_unsigned_int","_uint",0},
     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_size_t",0},
     { "_unsigned_int","_uint",0},


@@ -4085,6 +4630,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_short","_WXTYPE",0},
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},
     { "_short","_WXTYPE",0},
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},

+    { "_wxWindowID","_wxCoord",0},

     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_size_t",0},
     { "_wxWindowID","_EBool",0},
     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_size_t",0},
     { "_wxWindowID","_EBool",0},


@@ -4092,6 +4638,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxWindowID","_int",0},
     { "_wxWindowID","_signed_int",0},
     { "_wxWindowID","_unsigned_int",0},
     { "_wxWindowID","_int",0},
     { "_wxWindowID","_signed_int",0},
     { "_wxWindowID","_unsigned_int",0},

+    { "_int","_wxCoord",0},

     { "_int","_wxPrintQuality",0},
     { "_int","_size_t",0},
     { "_int","_EBool",0},
     { "_int","_wxPrintQuality",0},
     { "_int","_size_t",0},
     { "_int","_EBool",0},


@@ -4102,6 +4649,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
     { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
     { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},

+    { "_wxCoord","_int",0},
+    { "_wxCoord","_signed_int",0},
+    { "_wxCoord","_unsigned_int",0},
+    { "_wxCoord","_wxWindowID",0},
+    { "_wxCoord","_uint",0},
+    { "_wxCoord","_EBool",0},
+    { "_wxCoord","_size_t",0},
+    { "_wxCoord","_wxPrintQuality",0},

     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},
     { "_class_wxSize","_wxSize",0},
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},
     { "_class_wxSize","_wxSize",0},