From ef489f6a73a9afd25274897424177e06ce1971d3 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 18 Jan 2000 21:45:48 +0000 Subject: [PATCH] more fixes to match some updates in wxHTML git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/modules/html/html.cpp | 48 ++++++---------------------- utils/wxPython/modules/html/html.i | 1 - utils/wxPython/modules/html/html.py | 3 -- 3 files changed, 10 insertions(+), 42 deletions(-) diff --git a/utils/wxPython/modules/html/html.cpp b/utils/wxPython/modules/html/html.cpp index cd78a8f5c1..8d54500d32 100644 --- a/utils/wxPython/modules/html/html.cpp +++ b/utils/wxPython/modules/html/html.cpp @@ -1,5 +1,5 @@ /* - * FILE : ./html.cpp + * FILE : html.cpp * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) @@ -370,7 +370,7 @@ static PyObject *_wrap_wxHtmlLinkInfo_GetHref(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } { delete _result; @@ -402,7 +402,7 @@ static PyObject *_wrap_wxHtmlLinkInfo_GetTarget(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } { delete _result; @@ -502,7 +502,7 @@ static PyObject *_wrap_wxHtmlTag_GetName(PyObject *self, PyObject *args, PyObjec wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } { delete _result; @@ -584,7 +584,7 @@ static PyObject *_wrap_wxHtmlTag_GetParam(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } { if (_obj1) @@ -620,7 +620,7 @@ static PyObject *_wrap_wxHtmlTag_GetAllParams(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } { delete _result; @@ -1036,7 +1036,7 @@ static PyObject *_wrap_wxHtmlParser_GetSource(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); } return _resultobj; } @@ -3456,33 +3456,6 @@ static PyObject *_wrap_wxHtmlContainerCell_SetMinHeight(PyObject *self, PyObject return _resultobj; } -#define wxHtmlContainerCell_GetMaxLineWidth(_swigobj) (_swigobj->GetMaxLineWidth()) -static PyObject *_wrap_wxHtmlContainerCell_GetMaxLineWidth(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxHtmlContainerCell * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlContainerCell_GetMaxLineWidth",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlContainerCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlContainerCell_GetMaxLineWidth. Expected _wxHtmlContainerCell_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxHtmlContainerCell_GetMaxLineWidth(_arg0); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - #define wxHtmlContainerCell_SetBackgroundColour(_swigobj,_swigarg0) (_swigobj->SetBackgroundColour(_swigarg0)) static PyObject *_wrap_wxHtmlContainerCell_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3791,7 +3764,7 @@ static PyObject *_wrap_HtmlHistoryItem_GetPage(PyObject *self, PyObject *args, P wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); } return _resultobj; } @@ -3821,7 +3794,7 @@ static PyObject *_wrap_HtmlHistoryItem_GetAnchor(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); } return _resultobj; } @@ -4025,7 +3998,7 @@ static PyObject *_wrap_wxHtmlWindow_GetOpenedPage(PyObject *self, PyObject *args wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } { delete _result; @@ -5555,7 +5528,6 @@ static PyMethodDef htmlcMethods[] = { { "wxHtmlContainerCell_GetFirstCell", (PyCFunction) _wrap_wxHtmlContainerCell_GetFirstCell, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetBorder", (PyCFunction) _wrap_wxHtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_wxHtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, - { "wxHtmlContainerCell_GetMaxLineWidth", (PyCFunction) _wrap_wxHtmlContainerCell_GetMaxLineWidth, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetMinHeight", (PyCFunction) _wrap_wxHtmlContainerCell_SetMinHeight, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetWidthFloatFromTag", (PyCFunction) _wrap_wxHtmlContainerCell_SetWidthFloatFromTag, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetWidthFloat", (PyCFunction) _wrap_wxHtmlContainerCell_SetWidthFloat, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/modules/html/html.i b/utils/wxPython/modules/html/html.i index a9b65dae37..dfbe42c3dc 100644 --- a/utils/wxPython/modules/html/html.i +++ b/utils/wxPython/modules/html/html.i @@ -360,7 +360,6 @@ public: void SetWidthFloat(int w, int units); %name(SetWidthFloatFromTag)void SetWidthFloat(const wxHtmlTag& tag); void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP); - int GetMaxLineWidth(); void SetBackgroundColour(const wxColour& clr); void SetBorder(const wxColour& clr1, const wxColour& clr2); wxHtmlCell* GetFirstCell(); diff --git a/utils/wxPython/modules/html/html.py b/utils/wxPython/modules/html/html.py index 82ef9b9a2f..4231aac0cd 100644 --- a/utils/wxPython/modules/html/html.py +++ b/utils/wxPython/modules/html/html.py @@ -425,9 +425,6 @@ class wxHtmlContainerCellPtr(wxHtmlCellPtr): def SetMinHeight(self, *_args, **_kwargs): val = apply(htmlc.wxHtmlContainerCell_SetMinHeight,(self,) + _args, _kwargs) return val - def GetMaxLineWidth(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_GetMaxLineWidth,(self,) + _args, _kwargs) - return val def SetBackgroundColour(self, *_args, **_kwargs): val = apply(htmlc.wxHtmlContainerCell_SetBackgroundColour,(self,) + _args, _kwargs) return val -- 2.45.2