X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7449af7300c1a1f105caefdb0e77553b1d682bf9..bc50a2ae95f2ab36b16ceedc7902a9cbfb2f70ea:/wxPython/src/msw/html_wrap.cpp diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp index 5136c53ebd..e1db50f49b 100644 --- a/wxPython/src/msw/html_wrap.cpp +++ b/wxPython/src/msw/html_wrap.cpp @@ -1662,7 +1662,7 @@ static swig_module_info swig_module = {swig_types, 198, 0, 0, 0, 0}; static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout")); static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing")); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1701,7 +1701,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1874,31 +1874,30 @@ SWIGINTERNINLINE PyObject* } - static PyObject* t_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - PyObject* o3; - - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyTuple_Check(target)) { - o2 = target; - target = PyTuple_New(1); - PyTuple_SetItem(target, 0, o2); - } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); - - o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); - Py_DECREF(o3); - } - return target; - } + static PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1970,7 +1969,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2027,7 +2026,7 @@ SWIG_Check_unsigned_SS_int(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -2042,11 +2041,11 @@ SWIGINTERNINLINE PyObject* #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -2119,7 +2118,6 @@ public: } void OnLinkClicked(const wxHtmlLinkInfo& link); - void base_OnLinkClicked(const wxHtmlLinkInfo& link); wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type, const wxString& url, @@ -2149,9 +2147,6 @@ void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { if (! found) wxHtmlWindow::OnLinkClicked(link); } -void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) { - wxHtmlWindow::OnLinkClicked(link); -} wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type, @@ -2242,7 +2237,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2522,7 +2517,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2953,7 +2948,7 @@ static PyObject *_wrap_HtmlParser_GetFS(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2989,7 +2984,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp2) @@ -3340,7 +3335,7 @@ static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3424,7 +3419,7 @@ static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -4709,7 +4704,9 @@ static PyObject *_wrap_HtmlSelection_GetFromCell(PyObject *, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -4735,7 +4732,9 @@ static PyObject *_wrap_HtmlSelection_GetToCell(PyObject *, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -5900,7 +5899,9 @@ static PyObject *_wrap_HtmlCell_GetNext(PyObject *, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -5952,7 +5953,9 @@ static PyObject *_wrap_HtmlCell_GetFirstChild(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -6336,7 +6339,9 @@ static PyObject *_wrap_HtmlCell_Find(PyObject *, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -6511,7 +6516,9 @@ static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -6567,7 +6574,9 @@ static PyObject *_wrap_HtmlCell_GetFirstTerminal(PyObject *, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -6593,7 +6602,9 @@ static PyObject *_wrap_HtmlCell_GetLastTerminal(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -6751,6 +6762,99 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_HtmlWordCell_ConvertToText(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxHtmlWordCell *arg1 = (wxHtmlWordCell *) 0 ; + wxHtmlSelection *arg2 = (wxHtmlSelection *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "sel", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWordCell_ConvertToText",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlWordCell, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlSelection, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxHtmlWordCell const *)arg1)->ConvertToText(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_HtmlWordCell_IsLinebreakAllowed(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxHtmlWordCell *arg1 = (wxHtmlWordCell *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWordCell_IsLinebreakAllowed",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlWordCell, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxHtmlWordCell const *)arg1)->IsLinebreakAllowed(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_HtmlWordCell_SetPreviousWord(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxHtmlWordCell *arg1 = (wxHtmlWordCell *) 0 ; + wxHtmlWordCell *arg2 = (wxHtmlWordCell *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "cell", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWordCell_SetPreviousWord",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlWordCell, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlWordCell, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPreviousWord(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject * HtmlWordCell_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -7310,7 +7414,9 @@ static PyObject *_wrap_HtmlContainerCell_GetFirstChild(PyObject *, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlCell, 0); + { + resultobj = wxPyMake_wxObject(result, 0); + } return resultobj; fail: return NULL; @@ -8858,7 +8964,7 @@ static PyObject *_wrap_HtmlWindow_ToText(PyObject *, PyObject *args, PyObject *k } -static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnLinkClicked(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlLinkInfo *arg2 = 0 ; @@ -8868,7 +8974,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, (char *) "self",(char *) "link", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_base_OnLinkClicked",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_OnLinkClicked",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8881,7 +8987,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnLinkClicked((wxHtmlLinkInfo const &)*arg2); + (arg1)->OnLinkClicked((wxHtmlLinkInfo const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8893,7 +8999,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, } -static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnSetTitle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; @@ -8904,7 +9010,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py (char *) "self",(char *) "title", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_base_OnSetTitle",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_OnSetTitle",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8914,7 +9020,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnSetTitle((wxString const &)*arg2); + (arg1)->OnSetTitle((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8934,7 +9040,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py } -static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnCellMouseHover(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlCell *arg2 = (wxHtmlCell *) 0 ; @@ -8948,7 +9054,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *ar (char *) "self",(char *) "cell",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_base_OnCellMouseHover",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_OnCellMouseHover",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlCell, SWIG_POINTER_EXCEPTION | 0); @@ -8963,7 +9069,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnCellMouseHover(arg2,arg3,arg4); + (arg1)->OnCellMouseHover(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8975,7 +9081,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *ar } -static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlCell *arg2 = (wxHtmlCell *) 0 ; @@ -8991,7 +9097,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, (char *) "self",(char *) "cell",(char *) "x",(char *) "y",(char *) "event", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlWindow_base_OnCellClicked",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlWindow_OnCellClicked",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlCell, SWIG_POINTER_EXCEPTION | 0); @@ -9014,7 +9120,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5); + (arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11680,7 +11786,7 @@ static PyObject *_wrap_HtmlHelpWindow_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpWindow_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12154,7 +12260,7 @@ static PyObject *_wrap_HtmlHelpWindow_GetToolBar(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -12636,7 +12742,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetController(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpFrame_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpFrame, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12912,7 +13018,7 @@ static PyObject *_wrap_HtmlHelpDialog_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpDialog_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpDialog, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14691,6 +14797,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlCell_ConvertToText", (PyCFunction) _wrap_HtmlCell_ConvertToText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlCell_swigregister", HtmlCell_swigregister, METH_VARARGS, NULL}, { (char *)"new_HtmlWordCell", (PyCFunction) _wrap_new_HtmlWordCell, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWordCell_ConvertToText", (PyCFunction) _wrap_HtmlWordCell_ConvertToText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWordCell_IsLinebreakAllowed", (PyCFunction) _wrap_HtmlWordCell_IsLinebreakAllowed, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWordCell_SetPreviousWord", (PyCFunction) _wrap_HtmlWordCell_SetPreviousWord, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWordCell_swigregister", HtmlWordCell_swigregister, METH_VARARGS, NULL}, { (char *)"new_HtmlContainerCell", (PyCFunction) _wrap_new_HtmlContainerCell, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlContainerCell_InsertCell", (PyCFunction) _wrap_HtmlContainerCell_InsertCell, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -14755,10 +14864,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_base_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL}, { (char *)"new_HtmlDCRenderer", (PyCFunction) _wrap_new_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS, NULL},