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

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-08 01:37:37 +00:00
parent 85ac8ca017
commit 0346c96434
7 changed files with 205 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/contrib/ogl/mac/ogl.py
View File

@@ -3190,6 +3190,10 @@ class PyLineShape(PyShape):
"""GetLineControlPoints(self) -> PyObject"""
return _ogl.PyLineShape_GetLineControlPoints(*args, **kwargs)
def SetLineControlPoints(*args, **kwargs):
"""SetLineControlPoints(self, PyObject list)"""
return _ogl.PyLineShape_SetLineControlPoints(*args, **kwargs)
def SetAttachmentFrom(*args, **kwargs):
"""SetAttachmentFrom(self, int fromAttach)"""
return _ogl.PyLineShape_SetAttachmentFrom(*args, **kwargs)

86
wxPython/contrib/ogl/mac/ogl_wrap.cpp
View File

@@ -584,7 +584,25 @@ void wxPyLineShape_AddArrowOrdered(wxPyLineShape *self,wxArrowHead *arrow,PyObje
}
PyObject *wxPyLineShape_GetLineControlPoints(wxPyLineShape *self){
wxList* list = self->GetLineControlPoints();
return wxPy_ConvertShapeList(list);
return wxPy_ConvertRealPointList(list);
}
void wxPyLineShape_SetLineControlPoints(wxPyLineShape *self,PyObject *list){
wxList* real_point_list = wxPy_wxRealPoint_ListHelper(list);
self->MakeLineControlPoints((int)(real_point_list->GetCount()));
wxList* old_control_points = self->GetLineControlPoints();
wxNode* old_node = old_control_points->GetFirst();
wxNode* real_node = real_point_list->GetFirst();
while(old_node)
{
wxRealPoint* old_point = (wxRealPoint*)old_node->GetData();
wxRealPoint* new_point = (wxRealPoint*)real_node->GetData();
old_point->x = new_point->x;
old_point->y = new_point->y;
old_node = old_node->GetNext();
real_node = real_node->GetNext();
}
self->ClearPointList(*real_point_list);
delete real_point_list;
}
WXSHAPE_IMP_CALLBACKS(wxPyPolygonShape, wxPolygonShape);
@@ -600,21 +618,7 @@ PyObject *wxPyPolygonShape_Create(wxPyPolygonShape *self,PyObject *points){
}
PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
wxList* list = self->GetPoints();
PyObject* pyList;
PyObject* pyObj;
wxObject* wxObj;
wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->GetData();
pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
PyList_Append(pyList, pyObj);
node = node->GetNext();
}
wxPyEndBlockThreads(blocked);
return pyList;
return wxPy_ConvertRealPointList(list);
}
PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
wxList* list = self->GetOriginalPoints();
@@ -760,6 +764,27 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
//---------------------------------------------------------------------------
PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) {
wxList* list = (wxList*)listbase;
PyObject* pyList;
PyObject* pyObj;
wxObject* wxObj;
wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
while (node) {
wxObj = node->GetData();
pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
PyList_Append(pyList, pyObj);
node = node->GetNext();
}
wxPyEndBlockThreads(blocked);
return pyList;
}
//---------------------------------------------------------------------------
PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
wxList* list = (wxList*)listbase;
PyObject* pyList;
@@ -26383,6 +26408,34 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject
}
static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
PyObject *arg2 = (PyObject *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "list", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetLineControlPoints",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = obj1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyLineShape_SetLineControlPoints(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
@@ -33192,6 +33245,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyLineShape_SetLineControlPoints", (PyCFunction) _wrap_PyLineShape_SetLineControlPoints, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS },

6
wxPython/contrib/stc/mac/stc.py
View File

@@ -1985,7 +1985,11 @@ class StyledTextCtrl(_core.Control):
return _stc.StyledTextCtrl_DocumentEndExtend(*args, **kwargs)
def PageUp(*args, **kwargs):
"""PageUp(self)"""
"""
PageUp(self)
This is just a wrapper for ScrollPages(-1).
"""
return _stc.StyledTextCtrl_PageUp(*args, **kwargs)
def PageUpExtend(*args, **kwargs):

1
wxPython/contrib/stc/mac/stc_wrap.cpp
View File

@@ -714,6 +714,7 @@ static PyObject *_wrap_StyledTextCtrl_AddStyledText(PyObject *self, PyObject *ar
arg2 = new wxMemoryBuffer(len);
temp2 = True;
memcpy(arg2->GetData(), str, len);
arg2->SetDataLen(len);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();