Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various small fixes and tweaks

Browse Source 
Added wxIntersectRect helper function


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-11-30 20:21:55 +00:00
parent b47c832e55
commit eb7159455d
16 changed files with 808 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/wxPython/src/msw/controls2.cpp
View File

@@ -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 },

4
utils/wxPython/src/msw/controls2.py
View File

@@ -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):

28
utils/wxPython/src/msw/gdi.cpp
View File

@@ -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 },

3
utils/wxPython/src/msw/gdi.py
View File

@@ -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):

749
utils/wxPython/src/msw/misc.cpp
View File

File diff suppressed because it is too large Load Diff

47
utils/wxPython/src/msw/misc.py
View File

@@ -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 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)
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 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

47
utils/wxPython/src/msw/windows.cpp
View File

@@ -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 },

3
utils/wxPython/src/msw/windows.py
View File

@@ -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

3
utils/wxPython/src/msw/wx.py
View File

@@ -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):