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

Minor tweaks and such to be saved prior to messing with the wxPython

Browse Source 
build system...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-10-09 21:43:38 +00:00
parent e1b27de63f
commit 0498ecf0d4
4 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wxPython/src/gtk/controls2.cpp
View File

@@ -1970,6 +1970,14 @@ static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args, Py
return _resultobj; return _resultobj;
} }
static void *SwigwxListEventTowxNotifyEvent(void *ptr) {
wxListEvent *src;
wxNotifyEvent *dest;
src = (wxListEvent *) ptr;
dest = (wxNotifyEvent *) src;
return (void *) dest;
}
static void *SwigwxListEventTowxCommandEvent(void *ptr) { static void *SwigwxListEventTowxCommandEvent(void *ptr) {
wxListEvent *src; wxListEvent *src;
wxCommandEvent *dest; wxCommandEvent *dest;
@@ -3727,8 +3735,8 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args, PyObje
return _resultobj; return _resultobj;
} }
#define wxListCtrl_InsertColumnWith(_swigobj,_swigarg0,_swigarg1) (_swigobj->InsertColumn(_swigarg0,_swigarg1)) #define wxListCtrl_InsertColumnInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->InsertColumn(_swigarg0,_swigarg1))
static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxListCtrl_InsertColumnInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
long _result; long _result;
wxListCtrl * _arg0; wxListCtrl * _arg0;
@@ -3739,25 +3747,25 @@ static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *arg
char *_kwnames[] = { "self","col","info", NULL }; char *_kwnames[] = { "self","col","info", NULL };
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_InsertColumnWith",_kwnames,&_argo0,&_arg1,&_argo2)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_InsertColumnInfo",_kwnames,&_argo0,&_arg1,&_argo2))
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) { else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumnWith. Expected _wxListCtrl_p."); PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumnInfo. Expected _wxListCtrl_p.");
return NULL; return NULL;
} }
} }
if (_argo2) { if (_argo2) {
if (_argo2 == Py_None) { _arg2 = NULL; } if (_argo2 == Py_None) { _arg2 = NULL; }
else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxListItem_p")) { else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxListItem_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_InsertColumnWith. Expected _wxListItem_p."); PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_InsertColumnInfo. Expected _wxListItem_p.");
return NULL; return NULL;
} }
} }
{ {
wxPy_BEGIN_ALLOW_THREADS; wxPy_BEGIN_ALLOW_THREADS;
_result = (long )wxListCtrl_InsertColumnWith(_arg0,_arg1,*_arg2); _result = (long )wxListCtrl_InsertColumnInfo(_arg0,_arg1,*_arg2);
wxPy_END_ALLOW_THREADS; wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("l",_result); } _resultobj = Py_BuildValue("l",_result);
@@ -7565,7 +7573,7 @@ static PyMethodDef controls2cMethods[] = {
{ "wxListCtrl_InsertStringItem", (PyCFunction) _wrap_wxListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_InsertStringItem", (PyCFunction) _wrap_wxListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_InsertItem", (PyCFunction) _wrap_wxListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_InsertItem", (PyCFunction) _wrap_wxListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_InsertColumn", (PyCFunction) _wrap_wxListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_InsertColumn", (PyCFunction) _wrap_wxListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_InsertColumnWith", (PyCFunction) _wrap_wxListCtrl_InsertColumnWith, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_InsertColumnInfo", (PyCFunction) _wrap_wxListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_HitTest", (PyCFunction) _wrap_wxListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_HitTest", (PyCFunction) _wrap_wxListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_GetTopItem", (PyCFunction) _wrap_wxListCtrl_GetTopItem, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_GetTopItem", (PyCFunction) _wrap_wxListCtrl_GetTopItem, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_GetSelectedItemCount", (PyCFunction) _wrap_wxListCtrl_GetSelectedItemCount, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_GetSelectedItemCount", (PyCFunction) _wrap_wxListCtrl_GetSelectedItemCount, METH_VARARGS | METH_KEYWORDS },
@@ -7728,6 +7736,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCursor","_class_wxCursor",0}, { "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent}, { "_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
{ "_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent}, { "_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
{ "_wxNotifyEvent","_class_wxListEvent",SwigwxListEventTowxNotifyEvent},
{ "_wxNotifyEvent","_wxListEvent",SwigwxListEventTowxNotifyEvent},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_wxPyTreeCtrl","_class_wxPyTreeCtrl",0}, { "_wxPyTreeCtrl","_class_wxPyTreeCtrl",0},
{ "_wxMask","_class_wxMask",0}, { "_wxMask","_class_wxMask",0},
@@ -7822,6 +7832,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
{ "_class_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent}, { "_class_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
{ "_class_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent}, { "_class_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent},
{ "_class_wxNotifyEvent","_class_wxListEvent",SwigwxListEventTowxNotifyEvent},
{ "_class_wxNotifyEvent","_wxListEvent",SwigwxListEventTowxNotifyEvent},
{ "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0},
{ "_class_wxValidator","_wxValidator",0}, { "_class_wxValidator","_wxValidator",0},
{ "_class_wxPyEvent","_wxPyEvent",0}, { "_class_wxPyEvent","_wxPyEvent",0},

6
wxPython/src/gtk/controls2.py
View File

@@ -219,7 +219,7 @@ class wxListItem(wxListItemPtr):
class wxListEventPtr(wxCommandEventPtr): class wxListEventPtr(wxNotifyEventPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
@@ -401,8 +401,8 @@ class wxListCtrlPtr(wxControlPtr):
def HitTest(self, *_args, **_kwargs): def HitTest(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_HitTest,(self,) + _args, _kwargs) val = apply(controls2c.wxListCtrl_HitTest,(self,) + _args, _kwargs)
return val return val
def InsertColumnWith(self, *_args, **_kwargs): def InsertColumnInfo(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_InsertColumnWith,(self,) + _args, _kwargs) val = apply(controls2c.wxListCtrl_InsertColumnInfo,(self,) + _args, _kwargs)
return val return val
def InsertColumn(self, *_args, **_kwargs): def InsertColumn(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_InsertColumn,(self,) + _args, _kwargs) val = apply(controls2c.wxListCtrl_InsertColumn,(self,) + _args, _kwargs)

12
wxPython/src/gtk/misc.cpp
View File

@@ -3053,19 +3053,23 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a
return _resultobj; return _resultobj;
} }
#define new_wxRegion() (new wxRegion()) #define new_wxRegion(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxRegion(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxRegion * _result; wxRegion * _result;
char *_kwnames[] = { NULL }; long _arg0 = (long ) 0;
long _arg1 = (long ) 0;
long _arg2 = (long ) 0;
long _arg3 = (long ) 0;
char *_kwnames[] = { "x","y","width","height", NULL };
char _ptemp[128]; char _ptemp[128];
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxRegion",_kwnames)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|llll:new_wxRegion",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3))
return NULL; return NULL;
{ {
wxPy_BEGIN_ALLOW_THREADS; wxPy_BEGIN_ALLOW_THREADS;
_result = (wxRegion *)new_wxRegion(); _result = (wxRegion *)new_wxRegion(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS; wxPy_END_ALLOW_THREADS;
} if (_result) { } if (_result) {

7
wxPython/src/gtk/wx.py
View File

@@ -1461,9 +1461,6 @@ def EVT_LIST_SET_INFO(win, id, func):
def EVT_LIST_ITEM_SELECTED(win, id, func): def EVT_LIST_ITEM_SELECTED(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_SELECTED, func) win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_SELECTED, func)
def EVT_LIST_ITEM_ACTIVATED(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, func)
def EVT_LIST_ITEM_DESELECTED(win, id, func): def EVT_LIST_ITEM_DESELECTED(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_DESELECTED, func) win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_DESELECTED, func)
@@ -1482,6 +1479,10 @@ def EVT_LIST_ITEM_RIGHT_CLICK(win, id, func):
def EVT_LIST_ITEM_MIDDLE_CLICK(win, id, func): def EVT_LIST_ITEM_MIDDLE_CLICK(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, func) win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, func)
def EVT_LIST_ITEM_ACTIVATED(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, func)
#wxSplitterWindow #wxSplitterWindow