X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c32bde282cd479da5b09d5ffbb6f2e3558d66549..576f712776551bc0261005ff7a8c508d37481baa:/wxPython/src/msw/html_wrap.cpp diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp index 4780525fcd..a227baae9b 100644 --- a/wxPython/src/msw/html_wrap.cpp +++ b/wxPython/src/msw/html_wrap.cpp @@ -561,11 +561,12 @@ private: } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { - o2 = target; - target = PyTuple_New(1); - PyTuple_SetItem(target, 0, o2); - + } 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); @@ -575,7 +576,7 @@ private: Py_DECREF(o3); } return target; -} + } @@ -736,7 +737,7 @@ public: // returns True if this filter is able to open&read given file virtual bool CanRead(const wxFSFile& file) const { - bool rval = False; + bool rval = false; bool found; bool blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) { @@ -1054,8 +1055,8 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *, PyObject *args, PyObject *kw wxString const &arg2_defvalue = wxPyEmptyString ; wxString *arg2 = (wxString *) &arg2_defvalue ; wxHtmlLinkInfo *result; - bool temp1 = False ; - bool temp2 = False ; + bool temp1 = false ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1066,13 +1067,13 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } } { @@ -1325,7 +1326,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *, PyObject *args, PyObject *kw wxHtmlTag *arg1 = (wxHtmlTag *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1338,7 +1339,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1368,9 +1369,9 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *, PyObject *args, PyObject *kw PyObject *resultobj; wxHtmlTag *arg1 = (wxHtmlTag *) 0 ; wxString *arg2 = 0 ; - int arg3 = (int) False ; + int arg3 = (int) false ; wxString result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -1384,7 +1385,7 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { arg3 = (int)SWIG_As_int(obj2); @@ -1625,7 +1626,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kw wxHtmlParser *arg1 = (wxHtmlParser *) 0 ; wxString *arg2 = 0 ; wxObject *result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1638,7 +1639,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1668,7 +1669,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *, PyObject *args, PyObjec PyObject *resultobj; wxHtmlParser *arg1 = (wxHtmlParser *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1681,7 +1682,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2129,33 +2130,71 @@ static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *, PyObject *args, PyObje } -static PyObject *_wrap_HtmlWinParser_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWinParser_SetStandardFonts(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 = (int) -1 ; + wxString const &arg3_defvalue = wxPyEmptyString ; + wxString *arg3 = (wxString *) &arg3_defvalue ; + wxString const &arg4_defvalue = wxPyEmptyString ; + wxString *arg4 = (wxString *) &arg4_defvalue ; + bool temp3 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "size", NULL + (char *) "self",(char *) "size",(char *) "normal_face",(char *) "fixed_face", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlWinParser_NormalizeFontSizes",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:HtmlWinParser_SetStandardFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + } + if (obj3) { + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->NormalizeFontSizes(arg2); + (arg1)->SetStandardFonts(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return NULL; } @@ -2726,7 +2765,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *, PyObject *args, PyObjec PyObject *resultobj; wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -2739,7 +2778,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4373,7 +4412,7 @@ static PyObject *_wrap_HtmlCell_SetId(PyObject *, PyObject *args, PyObject *kwar PyObject *resultobj; wxHtmlCell *arg1 = (wxHtmlCell *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4386,7 +4425,7 @@ static PyObject *_wrap_HtmlCell_SetId(PyObject *, PyObject *args, PyObject *kwar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5236,7 +5275,7 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *, PyObject *args, PyObject *kw wxString *arg1 = 0 ; wxDC *arg2 = 0 ; wxHtmlWordCell *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5247,7 +5286,7 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) @@ -6006,7 +6045,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *, PyObject *args, PyObject *kwar wxPyHtmlWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = False ; + bool temp6 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6044,7 +6083,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *, PyObject *args, PyObject *kwar { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = True; + temp6 = true; } } { @@ -6108,7 +6147,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *, PyObject *args, PyObject *k bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = False ; + bool temp7 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6149,7 +6188,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *, PyObject *args, PyObject *k { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = True; + temp7 = true; } } { @@ -6212,7 +6251,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *, PyObject *args, PyObject * wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6225,7 +6264,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6256,7 +6295,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *, PyObject *args, PyObject wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6269,7 +6308,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6300,7 +6339,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *, PyObject *args, PyObject wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6313,7 +6352,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6344,7 +6383,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *, PyObject *args, PyObj wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6357,7 +6396,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6484,7 +6523,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *, PyObject *args, Py wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxFrame *arg2 = (wxFrame *) 0 ; wxString *arg3 = 0 ; - bool temp3 = False ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6500,7 +6539,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *, PyObject *args, Py { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6627,33 +6666,71 @@ static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *, PyObject *args, PyObject } -static PyObject *_wrap_HtmlWindow_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_SetStandardFonts(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; int arg2 = (int) -1 ; + wxString const &arg3_defvalue = wxPyEmptyString ; + wxString *arg3 = (wxString *) &arg3_defvalue ; + wxString const &arg4_defvalue = wxPyEmptyString ; + wxString *arg4 = (wxString *) &arg4_defvalue ; + bool temp3 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "size", NULL + (char *) "self",(char *) "size",(char *) "normal_face",(char *) "fixed_face", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlWindow_NormalizeFontSizes",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:HtmlWindow_SetStandardFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + } + if (obj3) { + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->NormalizeFontSizes(arg2); + (arg1)->SetStandardFonts(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return NULL; } @@ -6662,7 +6739,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6675,7 +6752,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7000,7 +7077,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *, PyObject *args, PyO wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7013,7 +7090,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7044,7 +7121,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *, PyObject *args, PyObject wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7057,7 +7134,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7299,7 +7376,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7312,7 +7389,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7579,9 +7656,9 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *, PyObject *args, Py wxString *arg2 = 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool arg4 = (bool) True ; - bool temp2 = False ; - bool temp3 = False ; + bool arg4 = (bool) true ; + bool temp2 = false ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7596,13 +7673,13 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } if (obj3) { @@ -7685,33 +7762,71 @@ static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_HtmlDCRenderer_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlDCRenderer_SetStandardFonts(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ; int arg2 = (int) -1 ; + wxString const &arg3_defvalue = wxPyEmptyString ; + wxString *arg3 = (wxString *) &arg3_defvalue ; + wxString const &arg4_defvalue = wxPyEmptyString ; + wxString *arg4 = (wxString *) &arg4_defvalue ; + bool temp3 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "size", NULL + (char *) "self",(char *) "size",(char *) "normal_face",(char *) "fixed_face", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlDCRenderer_NormalizeFontSizes",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:HtmlDCRenderer_SetStandardFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlDCRenderer, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + } + if (obj3) { + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->NormalizeFontSizes(arg2); + (arg1)->SetStandardFonts(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return NULL; } @@ -7722,7 +7837,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *, PyObject *args, PyObjec int arg2 ; int arg3 ; int arg4 = (int) 0 ; - int arg5 = (int) False ; + int arg5 = (int) false ; int arg6 = (int) INT_MAX ; int *arg7 = (int *) NULL ; int arg8 = (int) 0 ; @@ -7818,7 +7933,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *, PyObject *args, PyObject *kw wxString const &arg1_defvalue = wxPyHtmlPrintoutTitleStr ; wxString *arg1 = (wxString *) &arg1_defvalue ; wxHtmlPrintout *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "title", NULL @@ -7829,7 +7944,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } } { @@ -7861,9 +7976,9 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *, PyObject *args, PyOb wxString *arg2 = 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool arg4 = (bool) True ; - bool temp2 = False ; - bool temp3 = False ; + bool arg4 = (bool) true ; + bool temp2 = false ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7878,13 +7993,13 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } if (obj3) { @@ -7925,7 +8040,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *, PyObject *args, PyOb PyObject *resultobj; wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7938,7 +8053,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7967,7 +8082,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *, PyObject *args, PyObje wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7981,7 +8096,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { arg3 = (int)SWIG_As_int(obj2); @@ -8014,7 +8129,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *, PyObject *args, PyObje wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8028,7 +8143,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { arg3 = (int)SWIG_As_int(obj2); @@ -8102,33 +8217,71 @@ static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_HtmlPrintout_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlPrintout_SetStandardFonts(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ; int arg2 = (int) -1 ; + wxString const &arg3_defvalue = wxPyEmptyString ; + wxString *arg3 = (wxString *) &arg3_defvalue ; + wxString const &arg4_defvalue = wxPyEmptyString ; + wxString *arg4 = (wxString *) &arg4_defvalue ; + bool temp3 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "size", NULL + (char *) "self",(char *) "size",(char *) "normal_face",(char *) "fixed_face", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlPrintout_NormalizeFontSizes",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:HtmlPrintout_SetStandardFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlPrintout, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + } + if (obj3) { + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->NormalizeFontSizes(arg2); + (arg1)->SetStandardFonts(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return NULL; } @@ -8247,7 +8400,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject wxString *arg1 = (wxString *) &arg1_defvalue ; wxWindow *arg2 = (wxWindow *) NULL ; wxHtmlEasyPrinting *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8259,7 +8412,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } } if (obj1) { @@ -8318,7 +8471,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *, PyObject *args, PyObject *resultobj; wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8331,7 +8484,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8361,8 +8514,8 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *, PyObject *args, wxString *arg2 = 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool temp2 = False ; - bool temp3 = False ; + bool temp2 = false ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8376,13 +8529,13 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } { @@ -8419,7 +8572,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *, PyObject *args, Py PyObject *resultobj; wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8432,7 +8585,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8462,8 +8615,8 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *, PyObject *args, Py wxString *arg2 = 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool temp2 = False ; - bool temp3 = False ; + bool temp2 = false ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8477,13 +8630,13 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } { @@ -8571,7 +8724,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *, PyObject *args, Py wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8585,7 +8738,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { arg3 = (int)SWIG_As_int(obj2); @@ -8618,7 +8771,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *, PyObject *args, Py wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8632,7 +8785,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { arg3 = (int)SWIG_As_int(obj2); @@ -8706,33 +8859,71 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_HtmlEasyPrinting_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlEasyPrinting_SetStandardFonts(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; int arg2 = (int) -1 ; + wxString const &arg3_defvalue = wxPyEmptyString ; + wxString *arg3 = (wxString *) &arg3_defvalue ; + wxString const &arg4_defvalue = wxPyEmptyString ; + wxString *arg4 = (wxString *) &arg4_defvalue ; + bool temp3 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "size", NULL + (char *) "self",(char *) "size",(char *) "normal_face",(char *) "fixed_face", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlEasyPrinting_NormalizeFontSizes",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:HtmlEasyPrinting_SetStandardFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlEasyPrinting, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + } + if (obj3) { + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->NormalizeFontSizes(arg2); + (arg1)->SetStandardFonts(arg2,(wxString const &)*arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } + { + if (temp4) + delete arg4; + } return NULL; } @@ -8803,10 +8994,10 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *, PyObject *args, PyObject * wxString *arg3 = 0 ; wxString *arg4 = 0 ; wxHtmlBookRecord *result; - bool temp1 = False ; - bool temp2 = False ; - bool temp3 = False ; - bool temp4 = False ; + bool temp1 = false ; + bool temp2 = false ; + bool temp3 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8819,22 +9010,22 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *, PyObject *args, PyObject * { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = True; + temp4 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9099,7 +9290,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *, PyObject *args, PyObj PyObject *resultobj; wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9112,7 +9303,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9140,7 +9331,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *, PyObject *args, Py PyObject *resultobj; wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9153,7 +9344,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9181,7 +9372,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *, PyObject *args, PyObj PyObject *resultobj; wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9194,7 +9385,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9223,7 +9414,7 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *, PyObject *args, Py wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9236,7 +9427,7 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9649,7 +9840,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *, PyObject *args, PyObj PyObject *resultobj; wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9662,7 +9853,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9691,7 +9882,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *, PyObject *args, PyObject wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9704,7 +9895,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9735,7 +9926,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *, PyObject *args, P wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9748,7 +9939,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9963,7 +10154,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *, PyObject *args, PyObject *k int arg4 = (int) wxHF_DEFAULTSTYLE ; wxHtmlHelpData *arg5 = (wxHtmlHelpData *) NULL ; wxHtmlHelpFrame *result; - bool temp3 = False ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9982,7 +10173,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *, PyObject *args, PyObject *k { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } if (obj3) { @@ -10046,7 +10237,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *, PyObject *args, PyObject *resultobj; wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10059,7 +10250,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10087,7 +10278,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *, PyObject *args, PyObjec PyObject *resultobj; wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10100,7 +10291,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10208,7 +10399,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *, PyObject *args, P wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10221,7 +10412,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10253,7 +10444,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *, PyObject *args, PyObj wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool temp3 = False ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -10270,7 +10461,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *, PyObject *args, PyObj { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } { @@ -10438,7 +10629,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *, PyObject *a PyObject *resultobj; wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10451,7 +10642,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10479,7 +10670,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *, PyObject *args, PyObject *resultobj; wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10492,7 +10683,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10520,9 +10711,9 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *, PyObject *args, Py PyObject *resultobj; wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxString *arg2 = 0 ; - int arg3 = (int) False ; + int arg3 = (int) false ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -10536,7 +10727,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { arg3 = (int)SWIG_As_int(obj2); @@ -10570,7 +10761,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *, PyObject *args, Py PyObject *resultobj; wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10583,7 +10774,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10691,7 +10882,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *, PyObject *ar wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10704,7 +10895,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *, PyObject *ar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10736,7 +10927,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *, PyObject *args, wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool temp3 = False ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -10753,7 +10944,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *, PyObject *args, { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } { @@ -10926,7 +11117,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction) _wrap_HtmlWinParser_GetCharWidth, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWinParser_GetWindow", (PyCFunction) _wrap_HtmlWinParser_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"HtmlWinParser_NormalizeFontSizes", (PyCFunction) _wrap_HtmlWinParser_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWinParser_GetContainer", (PyCFunction) _wrap_HtmlWinParser_GetContainer, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWinParser_OpenContainer", (PyCFunction) _wrap_HtmlWinParser_OpenContainer, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWinParser_SetContainer", (PyCFunction) _wrap_HtmlWinParser_SetContainer, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -11081,7 +11272,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_GetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_GetRelatedFrame, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWindow_SetRelatedStatusBar", (PyCFunction) _wrap_HtmlWindow_SetRelatedStatusBar, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWindow_SetFonts", (PyCFunction) _wrap_HtmlWindow_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"HtmlWindow_NormalizeFontSizes", (PyCFunction) _wrap_HtmlWindow_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"HtmlWindow_SetStandardFonts", (PyCFunction) _wrap_HtmlWindow_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWindow_SetTitle", (PyCFunction) _wrap_HtmlWindow_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWindow_SetBorders", (PyCFunction) _wrap_HtmlWindow_SetBorders, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlWindow_ReadCustomization", (PyCFunction) _wrap_HtmlWindow_ReadCustomization, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -11113,7 +11304,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlDCRenderer_SetSize", (PyCFunction) _wrap_HtmlDCRenderer_SetSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlDCRenderer_SetHtmlText", (PyCFunction) _wrap_HtmlDCRenderer_SetHtmlText, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlDCRenderer_SetFonts", (PyCFunction) _wrap_HtmlDCRenderer_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"HtmlDCRenderer_NormalizeFontSizes", (PyCFunction) _wrap_HtmlDCRenderer_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"HtmlDCRenderer_SetStandardFonts", (PyCFunction) _wrap_HtmlDCRenderer_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlDCRenderer_Render", (PyCFunction) _wrap_HtmlDCRenderer_Render, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlDCRenderer_GetTotalHeight", (PyCFunction) _wrap_HtmlDCRenderer_GetTotalHeight, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlDCRenderer_swigregister", HtmlDCRenderer_swigregister, METH_VARARGS, NULL }, @@ -11123,7 +11314,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlPrintout_SetHeader", (PyCFunction) _wrap_HtmlPrintout_SetHeader, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlPrintout_SetFooter", (PyCFunction) _wrap_HtmlPrintout_SetFooter, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlPrintout_SetFonts", (PyCFunction) _wrap_HtmlPrintout_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"HtmlPrintout_NormalizeFontSizes", (PyCFunction) _wrap_HtmlPrintout_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"HtmlPrintout_SetStandardFonts", (PyCFunction) _wrap_HtmlPrintout_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlPrintout_SetMargins", (PyCFunction) _wrap_HtmlPrintout_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlPrintout_AddFilter", (PyCFunction) _wrap_HtmlPrintout_AddFilter, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlPrintout_CleanUpStatics", (PyCFunction) _wrap_HtmlPrintout_CleanUpStatics, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -11139,7 +11330,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlEasyPrinting_SetHeader", (PyCFunction) _wrap_HtmlEasyPrinting_SetHeader, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlEasyPrinting_SetFooter", (PyCFunction) _wrap_HtmlEasyPrinting_SetFooter, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlEasyPrinting_SetFonts", (PyCFunction) _wrap_HtmlEasyPrinting_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"HtmlEasyPrinting_NormalizeFontSizes", (PyCFunction) _wrap_HtmlEasyPrinting_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"HtmlEasyPrinting_SetStandardFonts", (PyCFunction) _wrap_HtmlEasyPrinting_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlEasyPrinting_GetPrintData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPrintData, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlEasyPrinting_GetPageSetupData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPageSetupData, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlEasyPrinting_swigregister", HtmlEasyPrinting_swigregister, METH_VARARGS, NULL },