From: Robin Dunn <robin@alldunn.com>
Date: Tue, 30 Nov 1999 20:21:55 +0000 (+0000)
Subject: Various small fixes and tweaks
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eb7159455d8967dbfa384e338eb584d09964d3fa
Various small fixes and tweaks
Added wxIntersectRect helper function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt
index 99fa7e57de..b8569032c6 100644
--- a/utils/wxPython/README.txt
+++ b/utils/wxPython/README.txt
@@ -63,6 +63,14 @@ Added wxPython.lib.filebrowsebutton also from Mike Fletcher.
Renamed wxTreeCtrl.GetParent to GetItemParent to avoid a name clash
with wxWindow.GetParent.
+Added wxIntersectRect to computer the intersection of two wxRect's.
+It is used like this:
+
+ intersect = wxIntersectRect(rect1, rect2)
+
+If r1 and r2 don't intersect then None is returned, otherwise the
+rectangle representing the intersection is returned.
+
What's new in 2.1.11
diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py
index cdff6809b3..a8a378d381 100644
--- a/utils/wxPython/src/_extras.py
+++ b/utils/wxPython/src/_extras.py
@@ -152,6 +152,9 @@ def EVT_IDLE(win, func):
def EVT_UPDATE_UI(win, id, func):
win.Connect(id, -1, wxEVT_UPDATE_UI, func)
+def EVT_UPDATE_UI_RANGE(win, id, id2, func):
+ win.Connect(id, id2, wxEVT_UPDATE_UI, func)
+
# Mouse Events
def EVT_LEFT_DOWN(win, func):
diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index 4d4911a575..8bae5da0dd 100644
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -388,7 +388,7 @@ public:
wxTreeItemId GetRootItem();
wxTreeItemId GetSelection();
- wxTreeItemId GetParent(const wxTreeItemId& item);
+ %name(GetItemParent) wxTreeItemId GetParent(const wxTreeItemId& item);
//size_t GetSelections(wxArrayTreeItemIds& selection);
%addmethods {
PyObject* GetSelections() {
diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index b97cb5a756..51591c96ed 100644
--- a/utils/wxPython/src/gdi.i
+++ b/utils/wxPython/src/gdi.i
@@ -92,7 +92,7 @@ wxBitmap* wxNoRefBitmap(char* name, long flags);
class wxMask {
public:
wxMask(const wxBitmap& bitmap);
- ~wxMask();
+ //~wxMask();
};
%new wxMask* wxMaskColour(const wxBitmap& bitmap, const wxColour& colour);
diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i
index 4c0a08255a..a9834bec46 100644
--- a/utils/wxPython/src/misc.i
+++ b/utils/wxPython/src/misc.i
@@ -114,29 +114,35 @@ public:
class wxRect {
public:
- wxRect(long x=0, long y=0, long w=0, long h=0);
- // TODO: do this one too... wxRect(const wxPoint& pos, const wxSize& size);
- ~wxRect();
+ wxRect(int x=0, int y=0, int w=0, int h=0);
+ // TODO: do this one too... wxRect(const wxPoint& pos, const wxSize& size);
+ ~wxRect();
- long GetX();
- void SetX(long X);
- long GetY();
- void SetY(long Y);
- long GetWidth();
- void SetWidth(long w);
- long GetHeight();
- void SetHeight(long h);
+ int GetX();
+ void SetX(int X);
+ int GetY();
+ void SetY(int Y);
+ int GetWidth();
+ void SetWidth(int w);
+ int GetHeight();
+ void SetHeight(int h);
- wxPoint GetPosition();
- wxSize GetSize();
+ wxPoint GetPosition();
+ wxSize GetSize();
- long GetLeft();
- long GetTop();
- long GetBottom();
- long GetRight();
+ int GetLeft();
+ int GetTop();
+ int GetBottom();
+ int GetRight();
- long x, y, width, height;
+ void SetLeft(int left);
+ void SetRight(int right);
+ void SetTop(int top);
+ void SetBottom(int bottom);
+
+
+ int x, y, width, height;
%addmethods {
PyObject* asTuple() {
@@ -153,6 +159,44 @@ public:
};
+// %inline %{
+// bool wxIntersectRect(wxRect* dest, wxRect* r1, wxRect* r2) {
+// wxRegion reg1(*r1);
+// wxRegion reg2(*r2);
+// bool success;
+// *dest = wxRect(0,0,0,0);
+// success = reg1.Intersect(reg2);
+// if (success) {
+// *dest = reg1.GetBox();
+// return *dest != wxRect(0,0,0,0);
+// }
+// return FALSE;
+// }
+// %}
+
+
+%inline %{
+ 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;
+ }
+%}
//---------------------------------------------------------------------------
@@ -166,7 +210,7 @@ void wxRegisterId(long id);
void wxBell();
void wxDisplaySize(int *OUTPUT, int *OUTPUT);
void wxEndBusyCursor();
-long wxExecute(const wxString& command, bool sync = FALSE);
+long wxExecute(const wxString& command, int sync = FALSE);
long wxGetElapsedTime(bool resetTimer = TRUE);
#ifdef __WXMSW__
long wxGetFreeMemory();
@@ -272,13 +316,27 @@ public:
wxRegionContain Contains(long x, long y);
%name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
%name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
+ %name(ContainsRectDim)wxRegionContain Contains(long x, long y, long w, long h);
wxRect GetBox();
- bool Intersect(const wxRect& rect);
+
+ bool Intersect(long x, long y, long width, long height);
+ %name(IntersectRect)bool Intersect(const wxRect& rect);
+ %name(IntersectRegion)bool Intersect(const wxRegion& region);
+
bool IsEmpty();
- bool Subtract(const wxRect& rect);
- bool Union(const wxRect& rect);
- bool Xor(const wxRect& rect);
+
+ bool Union(long x, long y, long width, long height);
+ %name(UnionRect)bool Union(const wxRect& rect);
+ %name(UnionRegion)bool Union(const wxRegion& region);
+
+ bool Subtract(long x, long y, long width, long height);
+ %name(SubtractRect)bool Subtract(const wxRect& rect);
+ %name(SubtractRegion)bool Subtract(const wxRegion& region);
+
+ bool Xor(long x, long y, long width, long height);
+ %name(XorRect)bool Xor(const wxRect& rect);
+ %name(XorRegion)bool Xor(const wxRegion& region);
};
diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp
index ce7a252c54..9b7cb275af 100644
--- a/utils/wxPython/src/msw/controls2.cpp
+++ b/utils/wxPython/src/msw/controls2.cpp
@@ -4429,8 +4429,8 @@ static PyObject *_wrap_wxTreeCtrl_GetSelection(PyObject *self, PyObject *args, P
return _resultobj;
}
-#define wxTreeCtrl_GetParent(_swigobj,_swigarg0) (_swigobj->GetParent(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxTreeCtrl_GetItemParent(_swigobj,_swigarg0) (_swigobj->GetParent(_swigarg0))
+static PyObject *_wrap_wxTreeCtrl_GetItemParent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxTreeItemId * _result;
wxTreeCtrl * _arg0;
@@ -4441,25 +4441,25 @@ static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args, PyOb
char _ptemp[128];
self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetParent",_kwnames,&_argo0,&_argo1))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetItemParent",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetParent. Expected _wxTreeCtrl_p.");
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemParent. Expected _wxTreeCtrl_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetParent. Expected _wxTreeItemId_p.");
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemParent. Expected _wxTreeItemId_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = new wxTreeItemId (wxTreeCtrl_GetParent(_arg0,*_arg1));
+ _result = new wxTreeItemId (wxTreeCtrl_GetItemParent(_arg0,*_arg1));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p");
@@ -5898,7 +5898,7 @@ static PyMethodDef controls2cMethods[] = {
{ "wxTreeCtrl_GetFirstChild", (PyCFunction) _wrap_wxTreeCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl_GetChildrenCount", (PyCFunction) _wrap_wxTreeCtrl_GetChildrenCount, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl_GetSelections", (PyCFunction) _wrap_wxTreeCtrl_GetSelections, METH_VARARGS | METH_KEYWORDS },
- { "wxTreeCtrl_GetParent", (PyCFunction) _wrap_wxTreeCtrl_GetParent, METH_VARARGS | METH_KEYWORDS },
+ { "wxTreeCtrl_GetItemParent", (PyCFunction) _wrap_wxTreeCtrl_GetItemParent, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl_GetSelection", (PyCFunction) _wrap_wxTreeCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl_GetRootItem", (PyCFunction) _wrap_wxTreeCtrl_GetRootItem, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl_IsSelected", (PyCFunction) _wrap_wxTreeCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS },
diff --git a/utils/wxPython/src/msw/controls2.py b/utils/wxPython/src/msw/controls2.py
index e3c0b297bb..e1ab777f15 100644
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -476,8 +476,8 @@ class wxTreeCtrlPtr(wxControlPtr):
val = apply(controls2c.wxTreeCtrl_GetSelection,(self,) + _args, _kwargs)
if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
return val
- def GetParent(self, *_args, **_kwargs):
- val = apply(controls2c.wxTreeCtrl_GetParent,(self,) + _args, _kwargs)
+ def GetItemParent(self, *_args, **_kwargs):
+ val = apply(controls2c.wxTreeCtrl_GetItemParent,(self,) + _args, _kwargs)
if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
return val
def GetSelections(self, *_args, **_kwargs):
diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp
index a3eb011657..97727aa6f0 100644
--- a/utils/wxPython/src/msw/gdi.cpp
+++ b/utils/wxPython/src/msw/gdi.cpp
@@ -1637,33 +1637,6 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args, PyObject *kwar
return _resultobj;
}
-#define delete_wxMask(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxMask(PyObject *self, PyObject *args, PyObject *kwargs) {
- PyObject * _resultobj;
- wxMask * _arg0;
- PyObject * _argo0 = 0;
- char *_kwnames[] = { "self", NULL };
-
- self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxMask",_kwnames,&_argo0))
- return NULL;
- if (_argo0) {
- if (_argo0 == Py_None) { _arg0 = NULL; }
- else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMask_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxMask. Expected _wxMask_p.");
- return NULL;
- }
- }
-{
- wxPy_BEGIN_ALLOW_THREADS;
- delete_wxMask(_arg0);
-
- wxPy_END_ALLOW_THREADS;
-} Py_INCREF(Py_None);
- _resultobj = Py_None;
- return _resultobj;
-}
-
static void *SwigwxIconTowxBitmap(void *ptr) {
wxIcon *src;
wxBitmap *dest;
@@ -7291,7 +7264,6 @@ static PyMethodDef gdicMethods[] = {
{ "wxIcon_GetDepth", (PyCFunction) _wrap_wxIcon_GetDepth, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxIcon", (PyCFunction) _wrap_delete_wxIcon, METH_VARARGS | METH_KEYWORDS },
{ "new_wxIcon", (PyCFunction) _wrap_new_wxIcon, METH_VARARGS | METH_KEYWORDS },
- { "delete_wxMask", (PyCFunction) _wrap_delete_wxMask, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMask", (PyCFunction) _wrap_new_wxMask, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmap_SetWidth", (PyCFunction) _wrap_wxBitmap_SetWidth, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmap_SetPalette", (PyCFunction) _wrap_wxBitmap_SetPalette, METH_VARARGS | METH_KEYWORDS },
diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index 2675107717..491e64eb7f 100644
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -67,9 +67,6 @@ class wxMaskPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
- def __del__(self,gdic=gdic):
- if self.thisown == 1 :
- gdic.delete_wxMask(self)
def __repr__(self):
return "<C wxMask instance at %s>" % (self.this,)
class wxMask(wxMaskPtr):
diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp
index 90b698bed7..302550837e 100644
--- 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";
+ 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);
@@ -115,6 +136,41 @@ static char* wxStringErrorMsg = "string type is required for parameter";
#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;
@@ -260,13 +316,12 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args, PyObject *kwarg
PyObject * _resultobj;
long _result;
wxString * _arg0;
- bool _arg1 = (bool ) FALSE;
+ int _arg1 = (int ) FALSE;
PyObject * _obj0 = 0;
- int tempbool1 = (int) FALSE;
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)) {
@@ -275,7 +330,6 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args, PyObject *kwarg
}
_arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
}
- _arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (long )wxExecute(*_arg0,_arg1);
@@ -1442,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;
- 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;
- 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;
@@ -1496,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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1512,10 +1566,10 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwa
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetX(_arg0);
+ _result = (int )wxRect_GetX(_arg0);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -1523,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;
- long _arg1;
+ int _arg1;
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;
@@ -1549,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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1565,10 +1619,10 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwa
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetY(_arg0);
+ _result = (int )wxRect_GetY(_arg0);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -1576,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;
- long _arg1;
+ int _arg1;
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;
@@ -1602,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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1618,10 +1672,10 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetWidth(_arg0);
+ _result = (int )wxRect_GetWidth(_arg0);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -1629,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;
- long _arg1;
+ int _arg1;
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;
@@ -1655,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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1671,10 +1725,10 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetHeight(_arg0);
+ _result = (int )wxRect_GetHeight(_arg0);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -1682,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;
- long _arg1;
+ int _arg1;
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;
@@ -1764,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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1780,17 +1834,17 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args, PyObject *
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetLeft(_arg0);
+ _result = (int )wxRect_GetLeft(_arg0);
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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1806,17 +1860,17 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args, PyObject *k
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetTop(_arg0);
+ _result = (int )wxRect_GetTop(_arg0);
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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1832,17 +1886,17 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetBottom(_arg0);
+ _result = (int )wxRect_GetBottom(_arg0);
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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1858,25 +1912,133 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_GetRight(_arg0);
+ _result = (int )wxRect_GetRight(_arg0);
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;
- long _result;
+ int _result;
wxRect * _arg0;
- long _arg1;
+ int _arg1;
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;
@@ -1885,17 +2047,17 @@ static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args, PyObject *kw
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_x_set(_arg0,_arg1);
+ _result = (int )wxRect_x_set(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1911,25 +2073,25 @@ static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args, PyObject *kw
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_x_get(_arg0);
+ _result = (int )wxRect_x_get(_arg0);
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;
- long _result;
+ int _result;
wxRect * _arg0;
- long _arg1;
+ int _arg1;
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;
@@ -1938,17 +2100,17 @@ static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args, PyObject *kw
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_y_set(_arg0,_arg1);
+ _result = (int )wxRect_y_set(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -1964,25 +2126,25 @@ static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args, PyObject *kw
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_y_get(_arg0);
+ _result = (int )wxRect_y_get(_arg0);
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;
- long _result;
+ int _result;
wxRect * _arg0;
- long _arg1;
+ int _arg1;
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;
@@ -1991,17 +2153,17 @@ static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_width_set(_arg0,_arg1);
+ _result = (int )wxRect_width_set(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -2017,25 +2179,25 @@ static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_width_get(_arg0);
+ _result = (int )wxRect_width_get(_arg0);
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;
- long _result;
+ int _result;
wxRect * _arg0;
- long _arg1;
+ int _arg1;
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;
@@ -2044,17 +2206,17 @@ static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args, PyObjec
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_height_set(_arg0,_arg1);
+ _result = (int )wxRect_height_set(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
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;
- long _result;
+ int _result;
wxRect * _arg0;
wxRect temp;
PyObject * _obj0 = 0;
@@ -2070,10 +2232,10 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args, PyObjec
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (long )wxRect_height_get(_arg0);
+ _result = (int )wxRect_height_get(_arg0);
wxPy_END_ALLOW_THREADS;
-} _resultobj = Py_BuildValue("l",_result);
+} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -3100,6 +3262,37 @@ static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args, PyO
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;
@@ -3129,8 +3322,39 @@ static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args, PyObject
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) {
+ 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;
@@ -3141,12 +3365,12 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObje
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")) {
- 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;
}
}
@@ -3157,7 +3381,43 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObje
}
{
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);
@@ -3191,8 +3451,39 @@ static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args, PyObject
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;
@@ -3203,12 +3494,12 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObjec
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")) {
- 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;
}
}
@@ -3219,15 +3510,82 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObjec
}
{
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;
}
-#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;
@@ -3238,12 +3596,12 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject *
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")) {
- 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;
}
}
@@ -3254,15 +3612,82 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject *
}
{
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_Xor(_swigobj,_swigarg0) (_swigobj->Xor(_swigarg0))
+#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;
+}
+
+#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) {
+ 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;
@@ -3273,12 +3698,12 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kw
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")) {
- 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;
}
}
@@ -3289,7 +3714,43 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kw
}
{
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);
@@ -3958,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 },
+ { "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_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_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_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_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 },
@@ -4004,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_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 },
@@ -4076,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 },
+ { "wxIntersectRect", (PyCFunction) _wrap_wxIntersectRect, METH_VARARGS | METH_KEYWORDS },
{ NULL, NULL }
};
#ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/misc.py b/utils/wxPython/src/msw/misc.py
index 378b31b85e..4df6a39760 100644
--- a/utils/wxPython/src/msw/misc.py
+++ b/utils/wxPython/src/msw/misc.py
@@ -196,6 +196,18 @@ class wxRectPtr :
def GetRight(self, *_args, **_kwargs):
val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs)
return val
+ def SetLeft(self, *_args, **_kwargs):
+ val = apply(miscc.wxRect_SetLeft,(self,) + _args, _kwargs)
+ return val
+ def SetRight(self, *_args, **_kwargs):
+ val = apply(miscc.wxRect_SetRight,(self,) + _args, _kwargs)
+ return val
+ def SetTop(self, *_args, **_kwargs):
+ val = apply(miscc.wxRect_SetTop,(self,) + _args, _kwargs)
+ return val
+ def SetBottom(self, *_args, **_kwargs):
+ val = apply(miscc.wxRect_SetBottom,(self,) + _args, _kwargs)
+ return val
def asTuple(self, *_args, **_kwargs):
val = apply(miscc.wxRect_asTuple,(self,) + _args, _kwargs)
return val
@@ -384,6 +396,9 @@ class wxRegionPtr :
def ContainsRect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_ContainsRect,(self,) + _args, _kwargs)
return val
+ def ContainsRectDim(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_ContainsRectDim,(self,) + _args, _kwargs)
+ return val
def GetBox(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_GetBox,(self,) + _args, _kwargs)
if val: val = wxRectPtr(val) ; val.thisown = 1
@@ -391,18 +406,42 @@ class wxRegionPtr :
def Intersect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)
return val
+ def IntersectRect(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_IntersectRect,(self,) + _args, _kwargs)
+ return val
+ def IntersectRegion(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_IntersectRegion,(self,) + _args, _kwargs)
+ return val
def IsEmpty(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)
return val
+ def Union(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_Union,(self,) + _args, _kwargs)
+ return val
+ def UnionRect(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_UnionRect,(self,) + _args, _kwargs)
+ return val
+ def UnionRegion(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_UnionRegion,(self,) + _args, _kwargs)
+ return val
def Subtract(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Subtract,(self,) + _args, _kwargs)
return val
- def Union(self, *_args, **_kwargs):
- val = apply(miscc.wxRegion_Union,(self,) + _args, _kwargs)
+ def SubtractRect(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_SubtractRect,(self,) + _args, _kwargs)
+ return val
+ def SubtractRegion(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_SubtractRegion,(self,) + _args, _kwargs)
return val
def Xor(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Xor,(self,) + _args, _kwargs)
return val
+ def XorRect(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_XorRect,(self,) + _args, _kwargs)
+ return val
+ def XorRegion(self, *_args, **_kwargs):
+ val = apply(miscc.wxRegion_XorRegion,(self,) + _args, _kwargs)
+ return val
def __repr__(self):
return "<C wxRegion instance at %s>" % (self.this,)
class wxRegion(wxRegionPtr):
@@ -528,6 +567,8 @@ class wxBusyInfo(wxBusyInfoPtr):
#-------------- FUNCTION WRAPPERS ------------------
+wxIntersectRect = miscc.wxIntersectRect
+
wxNewId = miscc.wxNewId
wxRegisterId = miscc.wxRegisterId
diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp
index f12227019e..10228a604c 100644
--- a/utils/wxPython/src/msw/windows.cpp
+++ b/utils/wxPython/src/msw/windows.cpp
@@ -3542,13 +3542,12 @@ static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args, PyO
int _arg2;
int _arg3;
int _arg4;
- bool _arg5 = (bool ) TRUE;
+ int _arg5 = (int ) TRUE;
PyObject * _argo0 = 0;
- int tempbool5 = (int) TRUE;
char *_kwnames[] = { "self","orientation","position","thumbSize","range","refresh", NULL };
self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxWindow_SetScrollbar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxWindow_SetScrollbar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3557,7 +3556,6 @@ static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args, PyO
return NULL;
}
}
- _arg5 = (bool ) tempbool5;
{
wxPy_BEGIN_ALLOW_THREADS;
wxWindow_SetScrollbar(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
@@ -5463,6 +5461,42 @@ static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *
return _resultobj;
}
+#define wxScrolledWindow_SetTargetWindow(_swigobj,_swigarg0) (_swigobj->SetTargetWindow(_swigarg0))
+static PyObject *_wrap_wxScrolledWindow_SetTargetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ wxScrolledWindow * _arg0;
+ wxWindow * _arg1;
+ PyObject * _argo0 = 0;
+ PyObject * _argo1 = 0;
+ char *_kwnames[] = { "self","window", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxScrolledWindow_SetTargetWindow",_kwnames,&_argo0,&_argo1))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_SetTargetWindow. Expected _wxScrolledWindow_p.");
+ return NULL;
+ }
+ }
+ if (_argo1) {
+ if (_argo1 == Py_None) { _arg1 = NULL; }
+ else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScrolledWindow_SetTargetWindow. Expected _wxWindow_p.");
+ return NULL;
+ }
+ }
+{
+ wxPy_BEGIN_ALLOW_THREADS;
+ wxScrolledWindow_SetTargetWindow(_arg0,_arg1);
+
+ wxPy_END_ALLOW_THREADS;
+} Py_INCREF(Py_None);
+ _resultobj = Py_None;
+ return _resultobj;
+}
+
#define wxScrolledWindow_ViewStart(_swigobj,_swigarg0,_swigarg1) (_swigobj->ViewStart(_swigarg0,_swigarg1))
static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6494,9 +6528,7 @@ static PyObject *_wrap_wxMenu_RemoveItem(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
-static void wxMenu_Destroy(wxMenu *self) {
- delete self;
- }
+static void wxMenu_Destroy(wxMenu *self) { delete self; }
static PyObject *_wrap_wxMenu_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMenu * _arg0;
@@ -8474,6 +8506,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxScrolledWindow_CalcUnscrolledPosition", (PyCFunction) _wrap_wxScrolledWindow_CalcUnscrolledPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_CalcScrolledPosition", (PyCFunction) _wrap_wxScrolledWindow_CalcScrolledPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_ViewStart", (PyCFunction) _wrap_wxScrolledWindow_ViewStart, METH_VARARGS | METH_KEYWORDS },
+ { "wxScrolledWindow_SetTargetWindow", (PyCFunction) _wrap_wxScrolledWindow_SetTargetWindow, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_SetScrollbars", (PyCFunction) _wrap_wxScrolledWindow_SetScrollbars, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_Scroll", (PyCFunction) _wrap_wxScrolledWindow_Scroll, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_PrepareDC", (PyCFunction) _wrap_wxScrolledWindow_PrepareDC, METH_VARARGS | METH_KEYWORDS },
diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py
index d94f570c62..093d5cad01 100644
--- a/utils/wxPython/src/msw/windows.py
+++ b/utils/wxPython/src/msw/windows.py
@@ -589,6 +589,9 @@ class wxScrolledWindowPtr(wxPanelPtr):
def SetScrollbars(self, *_args, **_kwargs):
val = apply(windowsc.wxScrolledWindow_SetScrollbars,(self,) + _args, _kwargs)
return val
+ def SetTargetWindow(self, *_args, **_kwargs):
+ val = apply(windowsc.wxScrolledWindow_SetTargetWindow,(self,) + _args, _kwargs)
+ return val
def ViewStart(self, *_args, **_kwargs):
val = apply(windowsc.wxScrolledWindow_ViewStart,(self,) + _args, _kwargs)
return val
diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py
index eec94a10b7..88a0217220 100644
--- a/utils/wxPython/src/msw/wx.py
+++ b/utils/wxPython/src/msw/wx.py
@@ -972,6 +972,9 @@ def EVT_IDLE(win, func):
def EVT_UPDATE_UI(win, id, func):
win.Connect(id, -1, wxEVT_UPDATE_UI, func)
+def EVT_UPDATE_UI_RANGE(win, id, id2, func):
+ win.Connect(id, id2, wxEVT_UPDATE_UI, func)
+
# Mouse Events
def EVT_LEFT_DOWN(win, func):
diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 6f913b7e2c..8b72acff56 100644
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -265,7 +265,7 @@ public:
void SetForegroundColour(const wxColour& colour);
void SetId(int id);
void SetName(const wxString& name);
- void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = TRUE);
+ void SetScrollbar(int orientation, int position, int thumbSize, int range, int refresh = TRUE);
void SetScrollPos(int orientation, int pos, bool refresh = TRUE);
%name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
@@ -433,6 +433,7 @@ public:
void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
int xPos = 0, int yPos = 0);
+ void SetTargetWindow(wxWindow* window);
void ViewStart(int* OUTPUT, int* OUTPUT);
void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
@@ -481,9 +482,7 @@ public:
%name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
%addmethods {
- void Destroy() {
- delete self;
- }
+ void Destroy() { delete self; }
}
%name(DestroyId)bool Destroy(int id);
%name(DestroyItem)bool Destroy(wxMenuItem *item);
diff --git a/utils/wxPython/tests/test5.py b/utils/wxPython/tests/test5.py
index 17976f73e4..f81ddbb515 100644
--- a/utils/wxPython/tests/test5.py
+++ b/utils/wxPython/tests/test5.py
@@ -89,31 +89,3 @@ if __name__ == '__main__':
#----------------------------------------------------------------------------
-#
-# $Log$
-# Revision 1.2 1998/12/15 20:44:36 RD
-# Changed the import semantics from "from wxPython import *" to "from
-# wxPython.wx import *" This is for people who are worried about
-# namespace pollution, they can use "from wxPython import wx" and then
-# prefix all the wxPython identifiers with "wx."
-#
-# Added wxTaskbarIcon for wxMSW.
-#
-# Made the events work for wxGrid.
-#
-# Added wxConfig.
-#
-# Added wxMiniFrame for wxGTK, (untested.)
-#
-# Changed many of the args and return values that were pointers to gdi
-# objects to references to reflect changes in the wxWindows API.
-#
-# Other assorted fixes and additions.
-#
-# Revision 1.1 1998/11/25 08:47:12 RD
-#
-# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
-# Added events for wxGrid
-# Other various fixes and additions
-#
-#