X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..7722248d7510121367c9d4db7af1156197c26e82:/wxPython/src/mac/html_wrap.cpp diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp index a085aa454b..5f34bfcbfc 100644 --- a/wxPython/src/mac/html_wrap.cpp +++ b/wxPython/src/mac/html_wrap.cpp @@ -97,10 +97,10 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); typedef struct swig_type_info { - const char *name; + const char *name; swig_converter_func converter; const char *str; - void *clientdata; + void *clientdata; swig_dycast_func dcast; struct swig_type_info *next; struct swig_type_info *prev; @@ -118,6 +118,7 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); #ifdef __cplusplus } + #endif /*********************************************************************** @@ -203,15 +204,8 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else #ifdef __cplusplus } @@ -441,9 +435,9 @@ class wxPyHtmlFilter : public wxHtmlFilter { public: wxPyHtmlFilter() : wxHtmlFilter() {} - // returns TRUE if this filter is able to open&read given file + // 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; wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) { @@ -614,8 +608,8 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject 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[] = { @@ -626,13 +620,13 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject { 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; } } { @@ -876,7 +870,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject wxHtmlTag *arg1 = (wxHtmlTag *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -888,7 +882,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -916,9 +910,9 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject 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 ; char *kwnames[] = { @@ -930,7 +924,7 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1157,7 +1151,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *self, PyObject *args, PyObject wxHtmlParser *arg1 = (wxHtmlParser *) 0 ; wxString *arg2 = 0 ; wxObject *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1169,7 +1163,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1199,7 +1193,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxHtmlParser *arg1 = (wxHtmlParser *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1211,7 +1205,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1372,7 +1366,6 @@ static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *self, PyObject *args, wxHtmlParser *arg1 = (wxHtmlParser *) 0 ; wxHtmlTagHandler *arg2 = (wxHtmlTagHandler *) 0 ; wxString arg3 ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -1383,8 +1376,12 @@ static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlParser_PushTagHandler",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxHtmlTagHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PushTagHandler(arg2,arg3); @@ -1594,8 +1591,6 @@ static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *self, PyObject *args, Py wxString arg2 ; wxString arg3 ; PyObject *arg4 = (PyObject *) NULL ; - wxString *argp2 ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -1606,10 +1601,18 @@ static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlWinParser_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj1); + if (sptr == NULL) SWIG_fail; + arg2 = *sptr; + delete sptr; + } + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } if (obj3) { arg4 = obj3; } @@ -2154,7 +2157,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -2166,7 +2169,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4187,8 +4190,8 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, P static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxHtmlCell *arg1 = (wxHtmlCell *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; unsigned int arg4 = (unsigned int) wxHTML_FIND_EXACT ; wxHtmlCell *result; PyObject * obj0 = 0 ; @@ -4395,7 +4398,7 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *self, PyObject *args, PyObject wxString *arg1 = 0 ; wxDC *arg2 = 0 ; wxHtmlWordCell *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4406,7 +4409,7 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *self, PyObject *args, PyObject { 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) SWIG_fail; if (arg2 == NULL) { @@ -5087,7 +5090,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * wxPyHtmlWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -5114,7 +5117,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -5180,7 +5183,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; @@ -5209,7 +5212,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -5269,7 +5272,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5281,7 +5284,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5310,7 +5313,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, 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[] = { @@ -5322,7 +5325,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5351,7 +5354,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, 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[] = { @@ -5363,7 +5366,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5392,7 +5395,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5404,7 +5407,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5526,7 +5529,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *self, PyObject *args 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 ; @@ -5540,7 +5543,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *self, PyObject *args { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5622,8 +5625,6 @@ static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObj wxString arg2 ; wxString arg3 ; PyObject *arg4 = (PyObject *) NULL ; - wxString *argp2 ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -5634,10 +5635,18 @@ static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlWindow_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj1); + if (sptr == NULL) SWIG_fail; + arg2 = *sptr; + delete sptr; + } + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } if (obj3) { arg4 = obj3; } @@ -5659,7 +5668,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5671,7 +5680,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5725,7 +5734,6 @@ static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *self, PyObject *ar wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString arg3 = (wxString) wxPyEmptyString ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -5737,8 +5745,12 @@ static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5759,7 +5771,6 @@ static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *self, PyObject *a wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString arg3 = (wxString) wxPyEmptyString ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -5771,8 +5782,12 @@ static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5967,7 +5982,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args, wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5979,7 +5994,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6008,7 +6023,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6020,7 +6035,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6102,7 +6117,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *self, PyObject *args PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6114,7 +6129,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6142,8 +6157,8 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlCell *arg2 = (wxHtmlCell *) 0 ; - wxCoord arg3 ; - wxCoord arg4 ; + int arg3 ; + int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6171,8 +6186,8 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *a PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlCell *arg2 = (wxHtmlCell *) 0 ; - wxCoord arg3 ; - wxCoord arg4 ; + int arg3 ; + int arg4 ; wxMouseEvent *arg5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -6315,9 +6330,9 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args 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 ; @@ -6331,13 +6346,13 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, 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; } } if (obj3) { @@ -6380,8 +6395,6 @@ static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, P wxString arg2 ; wxString arg3 ; PyObject *arg4 = (PyObject *) NULL ; - wxString *argp2 ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6392,10 +6405,18 @@ static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlDCRenderer_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj1); + if (sptr == NULL) SWIG_fail; + arg2 = *sptr; + delete sptr; + } + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } if (obj3) { arg4 = obj3; } @@ -6419,7 +6440,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO 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 ; @@ -6486,7 +6507,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *self, PyObject *args, PyObject 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 @@ -6497,7 +6518,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *self, PyObject *args, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -6528,9 +6549,9 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args, 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 ; @@ -6544,13 +6565,13 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, 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; } } if (obj3) { @@ -6591,7 +6612,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *self, PyObject *args, PyObject *resultobj; wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6603,7 +6624,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6632,7 +6653,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6644,7 +6665,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6673,7 +6694,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6685,7 +6706,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6715,8 +6736,6 @@ static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyO wxString arg2 ; wxString arg3 ; PyObject *arg4 = (PyObject *) NULL ; - wxString *argp2 ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6727,10 +6746,18 @@ static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlPrintout_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj1); + if (sptr == NULL) SWIG_fail; + arg2 = *sptr; + delete sptr; + } + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } if (obj3) { arg4 = obj3; } @@ -6835,7 +6862,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *self, PyObject *args, PyOb 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[] = { @@ -6847,7 +6874,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *self, PyObject *args, PyOb { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } if (obj1) { @@ -6903,7 +6930,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *self, PyObject *ar PyObject *resultobj; wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6915,7 +6942,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *self, PyObject *ar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6945,8 +6972,8 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *self, PyObject *ar 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 ; @@ -6959,13 +6986,13 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *self, PyObject *ar { 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; } } { @@ -7002,7 +7029,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *self, 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[] = { @@ -7014,7 +7041,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7044,8 +7071,8 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *self, 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 ; @@ -7058,13 +7085,13 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *self, 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; } } { @@ -7150,7 +7177,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7162,7 +7189,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7191,7 +7218,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) wxPAGE_ALL ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7203,7 +7230,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7233,8 +7260,6 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *self, PyObject *args, wxString arg2 ; wxString arg3 ; PyObject *arg4 = (PyObject *) NULL ; - wxString *argp2 ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7245,10 +7270,18 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlEasyPrinting_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlEasyPrinting,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj1); + if (sptr == NULL) SWIG_fail; + arg2 = *sptr; + delete sptr; + } + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } if (obj3) { arg4 = obj3; } @@ -7330,10 +7363,10 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *self, PyObject *args, PyObje 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 ; @@ -7346,22 +7379,22 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *self, PyObject *args, PyObje { 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(); @@ -7613,7 +7646,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *self, PyObject *args, P PyObject *resultobj; wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7625,7 +7658,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7653,7 +7686,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *self, PyObject *args PyObject *resultobj; wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7665,7 +7698,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7693,7 +7726,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *self, PyObject *args, P PyObject *resultobj; wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7705,7 +7738,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7734,7 +7767,7 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *self, PyObject *args wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7746,7 +7779,7 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8137,7 +8170,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *self, PyObject *args, P PyObject *resultobj; wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8149,7 +8182,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8178,7 +8211,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8190,7 +8223,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8219,7 +8252,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *self, PyObject *arg wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8231,7 +8264,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8437,12 +8470,12 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec int arg4 = (int) wxHF_DEFAULTSTYLE ; wxHtmlHelpData *arg5 = (wxHtmlHelpData *) NULL ; wxHtmlHelpFrame *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "wxWindowID",(char *) "title",(char *) "style",(char *) "data", NULL + (char *) "parent","arg2",(char *) "title",(char *) "style",(char *) "data", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OiO:new_HtmlHelpFrame",kwnames,&obj0,&arg2,&obj2,&arg4,&obj4)) goto fail; @@ -8451,7 +8484,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj4) { @@ -8508,7 +8541,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *self, PyObject *ar PyObject *resultobj; wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8520,7 +8553,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *self, PyObject *ar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8548,7 +8581,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8560,7 +8593,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8662,7 +8695,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8674,7 +8707,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8704,7 +8737,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *self, PyObject *args, P 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 ; @@ -8719,7 +8752,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *self, PyObject *args, P { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -8749,7 +8782,6 @@ static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *self, PyObject wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString arg3 = (wxString) wxPyEmptyString ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8761,8 +8793,12 @@ static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8783,7 +8819,6 @@ static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *self, PyObject wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString arg3 = (wxString) wxPyEmptyString ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8795,8 +8830,12 @@ static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8870,7 +8909,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *self, PyObjec PyObject *resultobj; wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8882,7 +8921,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *self, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8910,7 +8949,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *self, 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[] = { @@ -8922,7 +8961,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *self, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8950,9 +8989,9 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args 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 ; char *kwnames[] = { @@ -8964,7 +9003,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8992,7 +9031,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *self, 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[] = { @@ -9004,7 +9043,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9106,7 +9145,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9118,7 +9157,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9148,7 +9187,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *self, PyObject *ar 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 ; @@ -9163,7 +9202,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *self, PyObject *ar { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -9193,7 +9232,6 @@ static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *self, PyOb wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString arg3 = (wxString) wxPyEmptyString ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9205,8 +9243,12 @@ static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *self, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9227,7 +9269,6 @@ static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *self, PyO wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; wxConfigBase *arg2 = (wxConfigBase *) 0 ; wxString arg3 = (wxString) wxPyEmptyString ; - wxString *argp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9239,8 +9280,12 @@ static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *self, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + wxString* sptr = wxString_in_helper(obj2); + if (sptr == NULL) SWIG_fail; + arg3 = *sptr; + delete sptr; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads();