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

New wxHtml stuff, including a TagHandler for placing wxPython widgets

Browse Source 
on the html page.

Some other tweaks and fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-09-17 05:55:00 +00:00
parent 2819545569
commit e166644c53
19 changed files with 2097 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/wxPython/src/controls2.i
View File

@@ -158,9 +158,10 @@ public:
long GetItemData(long item);
%addmethods {
%new wxListItem* GetItem(long itemId) {
%new wxListItem* GetItem(long itemId, int col=0) {
wxListItem* info = new wxListItem;
info->m_itemId = itemId;
info->m_col = col;
self->GetItem(*info);
return info;
}

10
utils/wxPython/src/helpers.cpp
View File

@@ -663,10 +663,9 @@ HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
if (PyString_Check(o)) {
char* st = PyString_AsString(o);
if (PyInstance_Check(o)) {
wxBitmap* pt;
if (SWIG_GetPtr(st,(void **) &pt,"_wxBitmap_p")) {
if (SWIG_GetPtrObj(o, (void **) &pt,"_wxBitmap_p")) {
PyErr_SetString(PyExc_TypeError,"Expected _wxBitmap_p.");
return NULL;
}
@@ -718,10 +717,9 @@ HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
if (PyString_Check(o)) {
char* st = PyString_AsString(o);
if (PyInstance_Check(o)) {
wxAcceleratorEntry* ae;
if (SWIG_GetPtr(st,(void **) &ae,"_wxAcceleratorEntry_p")) {
if (SWIG_GetPtrObj(o, (void **) &ae,"_wxAcceleratorEntry_p")) {
PyErr_SetString(PyExc_TypeError,"Expected _wxAcceleratorEntry_p.");
return NULL;
}

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

@@ -1861,9 +1861,10 @@ static PyObject *_wrap_wxListCtrl_GetItemData(PyObject *self, PyObject *args, Py
return _resultobj;
}
static wxListItem * wxListCtrl_GetItem(wxListCtrl *self,long itemId) {
static wxListItem * wxListCtrl_GetItem(wxListCtrl *self,long itemId,int col) {
wxListItem* info = new wxListItem;
info->m_itemId = itemId;
info->m_col = col;
self->GetItem(*info);
return info;
}
@@ -1872,12 +1873,13 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args, PyObje
wxListItem * _result;
wxListCtrl * _arg0;
long _arg1;
int _arg2 = (int ) 0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","itemId", NULL };
char *_kwnames[] = { "self","itemId","col", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_GetItem",_kwnames,&_argo0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|i:wxListCtrl_GetItem",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1888,7 +1890,7 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args, PyObje
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxListItem *)wxListCtrl_GetItem(_arg0,_arg1);
_result = (wxListItem *)wxListCtrl_GetItem(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {