X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4c0a16186cae6d4a780b59314532fab473fb0b..74b8433210c15d1dabeb5cc90e076b64867b9b42:/wxPython/src/mac/html_wrap.cpp

diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp
index 93b743867f..28c2188dcf 100644
--- a/wxPython/src/mac/html_wrap.cpp
+++ b/wxPython/src/mac/html_wrap.cpp
@@ -214,51 +214,52 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #define  SWIGTYPE_p_wxHtmlRenderingStyle swig_types[5] 
 #define  SWIGTYPE_p_wxMouseEvent swig_types[6] 
 #define  SWIGTYPE_p_wxHtmlWordCell swig_types[7] 
-#define  SWIGTYPE_p_wxHtmlHelpData swig_types[8] 
-#define  SWIGTYPE_p_char swig_types[9] 
-#define  SWIGTYPE_p_wxHtmlWinParser swig_types[10] 
-#define  SWIGTYPE_p_wxHtmlParser swig_types[11] 
-#define  SWIGTYPE_p_wxPanel swig_types[12] 
-#define  SWIGTYPE_p_wxFont swig_types[13] 
-#define  SWIGTYPE_p_wxHtmlColourCell swig_types[14] 
-#define  SWIGTYPE_p_wxPyHtmlWindow swig_types[15] 
-#define  SWIGTYPE_p_wxScrolledWindow swig_types[16] 
-#define  SWIGTYPE_p_wxWindow swig_types[17] 
-#define  SWIGTYPE_p_wxTopLevelWindow swig_types[18] 
-#define  SWIGTYPE_p_wxHtmlFontCell swig_types[19] 
-#define  SWIGTYPE_p_wxHtmlEasyPrinting swig_types[20] 
-#define  SWIGTYPE_p_wxHtmlSelection swig_types[21] 
-#define  SWIGTYPE_p_wxHtmlRenderingInfo swig_types[22] 
-#define  SWIGTYPE_p_wxHtmlWidgetCell swig_types[23] 
-#define  SWIGTYPE_p_wxObject swig_types[24] 
-#define  SWIGTYPE_p_wxString swig_types[25] 
-#define  SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[26] 
-#define  SWIGTYPE_p_wxHtmlTagHandler swig_types[27] 
-#define  SWIGTYPE_p_wxPyHtmlTagHandler swig_types[28] 
-#define  SWIGTYPE_p_wxEvtHandler swig_types[29] 
-#define  SWIGTYPE_p_wxPoint swig_types[30] 
-#define  SWIGTYPE_p_wxHtmlHelpController swig_types[31] 
-#define  SWIGTYPE_p_wxCursor swig_types[32] 
-#define  SWIGTYPE_p_wxFileSystem swig_types[33] 
-#define  SWIGTYPE_p_wxHtmlBookRecArray swig_types[34] 
-#define  SWIGTYPE_p_wxPyPrintout swig_types[35] 
-#define  SWIGTYPE_p_wxHtmlPrintout swig_types[36] 
-#define  SWIGTYPE_p_wxHtmlSearchStatus swig_types[37] 
-#define  SWIGTYPE_p_wxHtmlContentsItem swig_types[38] 
-#define  SWIGTYPE_p_wxConfigBase swig_types[39] 
-#define  SWIGTYPE_p_wxPrintData swig_types[40] 
-#define  SWIGTYPE_p_wxHtmlHelpFrame swig_types[41] 
-#define  SWIGTYPE_p_wxHtmlRenderingState swig_types[42] 
-#define  SWIGTYPE_p_wxFrame swig_types[43] 
-#define  SWIGTYPE_p_wxPyHtmlFilter swig_types[44] 
-#define  SWIGTYPE_p_wxHtmlFilter swig_types[45] 
-#define  SWIGTYPE_p_wxHtmlCell swig_types[46] 
-#define  SWIGTYPE_p_wxHtmlContainerCell swig_types[47] 
-#define  SWIGTYPE_p_wxHtmlTag swig_types[48] 
-#define  SWIGTYPE_p_wxHtmlLinkInfo swig_types[49] 
-#define  SWIGTYPE_p_int swig_types[50] 
-#define  SWIGTYPE_p_wxHtmlBookRecord swig_types[51] 
-static swig_type_info *swig_types[53];
+#define  SWIGTYPE_p_wxVisualAttributes swig_types[8] 
+#define  SWIGTYPE_p_wxHtmlHelpData swig_types[9] 
+#define  SWIGTYPE_p_char swig_types[10] 
+#define  SWIGTYPE_p_wxHtmlWinParser swig_types[11] 
+#define  SWIGTYPE_p_wxHtmlParser swig_types[12] 
+#define  SWIGTYPE_p_wxPanel swig_types[13] 
+#define  SWIGTYPE_p_wxFont swig_types[14] 
+#define  SWIGTYPE_p_wxHtmlColourCell swig_types[15] 
+#define  SWIGTYPE_p_wxPyHtmlWindow swig_types[16] 
+#define  SWIGTYPE_p_wxScrolledWindow swig_types[17] 
+#define  SWIGTYPE_p_wxWindow swig_types[18] 
+#define  SWIGTYPE_p_wxTopLevelWindow swig_types[19] 
+#define  SWIGTYPE_p_wxHtmlFontCell swig_types[20] 
+#define  SWIGTYPE_p_wxHtmlEasyPrinting swig_types[21] 
+#define  SWIGTYPE_p_wxHtmlSelection swig_types[22] 
+#define  SWIGTYPE_p_wxHtmlRenderingInfo swig_types[23] 
+#define  SWIGTYPE_p_wxHtmlWidgetCell swig_types[24] 
+#define  SWIGTYPE_p_wxObject swig_types[25] 
+#define  SWIGTYPE_p_wxString swig_types[26] 
+#define  SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[27] 
+#define  SWIGTYPE_p_wxHtmlTagHandler swig_types[28] 
+#define  SWIGTYPE_p_wxPyHtmlTagHandler swig_types[29] 
+#define  SWIGTYPE_p_wxEvtHandler swig_types[30] 
+#define  SWIGTYPE_p_wxPoint swig_types[31] 
+#define  SWIGTYPE_p_wxHtmlHelpController swig_types[32] 
+#define  SWIGTYPE_p_wxCursor swig_types[33] 
+#define  SWIGTYPE_p_wxFileSystem swig_types[34] 
+#define  SWIGTYPE_p_wxHtmlBookRecArray swig_types[35] 
+#define  SWIGTYPE_p_wxPyPrintout swig_types[36] 
+#define  SWIGTYPE_p_wxHtmlPrintout swig_types[37] 
+#define  SWIGTYPE_p_wxHtmlSearchStatus swig_types[38] 
+#define  SWIGTYPE_p_wxHtmlContentsItem swig_types[39] 
+#define  SWIGTYPE_p_wxConfigBase swig_types[40] 
+#define  SWIGTYPE_p_wxPrintData swig_types[41] 
+#define  SWIGTYPE_p_wxHtmlHelpFrame swig_types[42] 
+#define  SWIGTYPE_p_wxHtmlRenderingState swig_types[43] 
+#define  SWIGTYPE_p_wxFrame swig_types[44] 
+#define  SWIGTYPE_p_wxPyHtmlFilter swig_types[45] 
+#define  SWIGTYPE_p_wxHtmlFilter swig_types[46] 
+#define  SWIGTYPE_p_wxHtmlCell swig_types[47] 
+#define  SWIGTYPE_p_wxHtmlContainerCell swig_types[48] 
+#define  SWIGTYPE_p_wxHtmlTag swig_types[49] 
+#define  SWIGTYPE_p_wxHtmlLinkInfo swig_types[50] 
+#define  SWIGTYPE_p_int swig_types[51] 
+#define  SWIGTYPE_p_wxHtmlBookRecord swig_types[52] 
+static swig_type_info *swig_types[54];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -358,7 +359,15 @@ SWIG_CheckLongInRange(long value, const char* type,
 SWIGSTATICINLINE(long)
 SWIG_AsLong(PyObject * obj)
 {
-  return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj);
+    if (PyNumber_Check(obj))
+        return PyInt_AsLong(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
 }
 
 
@@ -447,21 +456,21 @@ public:
     }
 
     void OnExit() {
-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();
         Py_DECREF(m_tagHandlerClass);
         m_tagHandlerClass = NULL;
         for (size_t x=0; x < m_objArray.GetCount(); x++) {
             PyObject* obj = (PyObject*)m_objArray.Item(x);
             Py_DECREF(obj);
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
     };
 
     void FillHandlersTable(wxHtmlWinParser *parser) {
         // Wave our magic wand...  (if it works it's a miracle!  ;-)
 
         // First, make a new instance of the tag handler
-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();
         PyObject* arg = PyTuple_New(0);
         PyObject* obj = PyObject_CallObject(m_tagHandlerClass, arg);
         Py_DECREF(arg);
@@ -469,10 +478,10 @@ public:
         // now figure out where it's C++ object is...
         wxPyHtmlWinTagHandler* thPtr;
         if (! wxPyConvertSwigPtr(obj, (void **)&thPtr, wxT("wxPyHtmlWinTagHandler"))) {
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
             return;
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
 
         // add it,
         parser->AddTagHandler(thPtr);
@@ -565,9 +574,9 @@ SWIG_AsUnsignedLong(PyObject * obj)
   if (PyLong_Check(obj)) {
     return PyLong_AsUnsignedLong(obj);
   } else {
-    long i = PyInt_AsLong(obj);
+    long i = SWIG_AsLong(obj);
     if ( !PyErr_Occurred() && (i < 0)) {
-      PyErr_SetString(PyExc_TypeError, "negative value for unsigned type");
+      PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
     }
     return i;
   }
@@ -625,13 +634,13 @@ public:
     virtual bool CanRead(const wxFSFile& file) const {
         bool rval = False;
         bool found;
-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) {
             PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file);  // cast away const
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
             Py_DECREF(obj);
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return rval;
     }
 
@@ -641,7 +650,7 @@ public:
     virtual wxString ReadFile(const wxFSFile& file) const {
         wxString rval;
         bool found;
-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "ReadFile"))) {
             PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file);  // cast away const
             PyObject* ro;
@@ -652,7 +661,7 @@ public:
                 Py_DECREF(ro);
             }
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return rval;
     }
 
@@ -703,13 +712,13 @@ IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
     bool found;
-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();
     if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) {
         PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
         Py_DECREF(obj);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     if (! found)
         wxHtmlWindow::OnLinkClicked(link);
 }
@@ -723,7 +732,7 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
                                                  wxString *redirect) const {
     bool found;
     wxHtmlOpeningStatus rval;
-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();
     if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) {
         PyObject* ro;
         PyObject* s = wx2PyString(url);
@@ -744,7 +753,7 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
         }
         Py_DECREF(ro);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     if (! found)
         rval = wxHtmlWindow::OnOpeningURL(type, url, redirect);
     return rval;
@@ -804,17 +813,15 @@ SWIG_FloatCast(double value)
 SWIGSTATICINLINE(double)
 SWIG_AsDouble(PyObject *obj)
 {
-  double val = (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) :
-#if HAVE_LONG_LONG
-    ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj));
-#else
-    ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj));
-#endif
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "a double is expected");
-  }
-  return val;
+    if (PyNumber_Check(obj))
+        return PyFloat_AsDouble(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
 }
 
 
@@ -852,7 +859,7 @@ wxHtmlBookRecord *wxHtmlContentsItem_GetBook(wxHtmlContentsItem *self){ return s
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_HtmlWindowNameStr_set(PyObject *) {
+static int _wrap_HtmlWindowNameStr_set(PyObject *_val) {
     PyErr_SetString(PyExc_TypeError,"Variable HtmlWindowNameStr is read-only.");
     return 1;
 }
@@ -872,7 +879,7 @@ static PyObject *_wrap_HtmlWindowNameStr_get() {
 }
 
 
-static int _wrap_HtmlPrintoutTitleStr_set(PyObject *) {
+static int _wrap_HtmlPrintoutTitleStr_set(PyObject *_val) {
     PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintoutTitleStr is read-only.");
     return 1;
 }
@@ -892,7 +899,7 @@ static PyObject *_wrap_HtmlPrintoutTitleStr_get() {
 }
 
 
-static int _wrap_HtmlPrintingTitleStr_set(PyObject *) {
+static int _wrap_HtmlPrintingTitleStr_set(PyObject *_val) {
     PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintingTitleStr is read-only.");
     return 1;
 }
@@ -912,7 +919,7 @@ static PyObject *_wrap_HtmlPrintingTitleStr_get() {
 }
 
 
-static PyObject *_wrap_new_HtmlLinkInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -969,7 +976,7 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetHref(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetHref(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxString result;
@@ -1001,7 +1008,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetHref(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetTarget(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxString result;
@@ -1033,7 +1040,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetTarget(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxMouseEvent *result;
@@ -1061,7 +1068,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetHtmlCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetHtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxHtmlCell *result;
@@ -1087,7 +1094,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetHtmlCell(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_SetEvent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_SetEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxMouseEvent *arg2 = (wxMouseEvent *) 0 ;
@@ -1116,7 +1123,7 @@ static PyObject *_wrap_HtmlLinkInfo_SetEvent(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_SetHtmlCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_SetHtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -1145,14 +1152,14 @@ static PyObject *_wrap_HtmlLinkInfo_SetHtmlCell(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * HtmlLinkInfo_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlLinkInfo_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlLinkInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlTag_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString result;
@@ -1184,7 +1191,7 @@ static PyObject *_wrap_HtmlTag_GetName(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_HtmlTag_HasParam(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString *arg2 = 0 ;
@@ -1211,7 +1218,9 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -1226,7 +1235,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlTag_GetParam(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString *arg2 = 0 ;
@@ -1280,7 +1289,7 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlTag_GetAllParams(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetAllParams(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString result;
@@ -1312,7 +1321,7 @@ static PyObject *_wrap_HtmlTag_GetAllParams(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlTag_HasEnding(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_HasEnding(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     bool result;
@@ -1331,14 +1340,16 @@ static PyObject *_wrap_HtmlTag_HasEnding(PyObject *, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     int result;
@@ -1364,7 +1375,7 @@ static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     int result;
@@ -1390,7 +1401,7 @@ static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     int result;
@@ -1416,14 +1427,14 @@ static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject * HtmlTag_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlTag_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlTag, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlParser_SetFS(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_SetFS(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxFileSystem *arg2 = (wxFileSystem *) 0 ;
@@ -1452,7 +1463,7 @@ static PyObject *_wrap_HtmlParser_SetFS(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlParser_GetFS(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_GetFS(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxFileSystem *result;
@@ -1480,7 +1491,7 @@ static PyObject *_wrap_HtmlParser_GetFS(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_Parse(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *arg2 = 0 ;
@@ -1524,7 +1535,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlParser_InitParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_InitParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *arg2 = 0 ;
@@ -1565,7 +1576,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlParser_DoneParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_DoneParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1590,7 +1601,7 @@ static PyObject *_wrap_HtmlParser_DoneParser(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlParser_DoParsing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_DoParsing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     int arg2 ;
@@ -1623,7 +1634,7 @@ static PyObject *_wrap_HtmlParser_DoParsing(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlParser_StopParsing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_StopParsing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1648,7 +1659,7 @@ static PyObject *_wrap_HtmlParser_StopParsing(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlParser_AddTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_AddTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxHtmlTagHandler *arg2 = (wxHtmlTagHandler *) 0 ;
@@ -1677,7 +1688,7 @@ static PyObject *_wrap_HtmlParser_AddTagHandler(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlParser_GetSource(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_GetSource(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *result;
@@ -1709,7 +1720,7 @@ static PyObject *_wrap_HtmlParser_GetSource(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxHtmlTagHandler *arg2 = (wxHtmlTagHandler *) 0 ;
@@ -1746,7 +1757,7 @@ static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlParser_PopTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_PopTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1771,14 +1782,14 @@ static PyObject *_wrap_HtmlParser_PopTagHandler(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * HtmlParser_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlParser_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlParser, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWinParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWinParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) NULL ;
     wxHtmlWinParser *result;
@@ -1806,7 +1817,7 @@ static PyObject *_wrap_new_HtmlWinParser(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetDC(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -1835,7 +1846,7 @@ static PyObject *_wrap_HtmlWinParser_SetDC(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxDC *result;
@@ -1863,7 +1874,7 @@ static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -1889,7 +1900,7 @@ static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -1915,7 +1926,7 @@ static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxPyHtmlWindow *result;
@@ -1943,7 +1954,7 @@ static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxString arg2 ;
@@ -1989,7 +2000,7 @@ static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetContainer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *result;
@@ -2015,7 +2026,7 @@ static PyObject *_wrap_HtmlWinParser_GetContainer(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_OpenContainer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_OpenContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *result;
@@ -2041,7 +2052,7 @@ static PyObject *_wrap_HtmlWinParser_OpenContainer(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetContainer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *arg2 = (wxHtmlContainerCell *) 0 ;
@@ -2071,7 +2082,7 @@ static PyObject *_wrap_HtmlWinParser_SetContainer(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_CloseContainer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_CloseContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *result;
@@ -2097,7 +2108,7 @@ static PyObject *_wrap_HtmlWinParser_CloseContainer(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2123,7 +2134,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2152,7 +2163,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2178,7 +2189,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2207,7 +2218,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2233,7 +2244,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2262,7 +2273,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2288,7 +2299,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2317,7 +2328,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2343,7 +2354,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2372,7 +2383,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2398,7 +2409,7 @@ static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2427,7 +2438,7 @@ static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetLinkColor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetLinkColor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour result;
@@ -2457,7 +2468,7 @@ static PyObject *_wrap_HtmlWinParser_GetLinkColor(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetLinkColor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetLinkColor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour *arg2 = 0 ;
@@ -2489,7 +2500,7 @@ static PyObject *_wrap_HtmlWinParser_SetLinkColor(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetActualColor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetActualColor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour result;
@@ -2519,7 +2530,7 @@ static PyObject *_wrap_HtmlWinParser_GetActualColor(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetActualColor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetActualColor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour *arg2 = 0 ;
@@ -2551,7 +2562,7 @@ static PyObject *_wrap_HtmlWinParser_SetActualColor(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxString *arg2 = 0 ;
@@ -2592,7 +2603,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWinParser_CreateCurrentFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_CreateCurrentFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxFont *result;
@@ -2618,7 +2629,7 @@ static PyObject *_wrap_HtmlWinParser_CreateCurrentFont(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     SwigValueWrapper< wxHtmlLinkInfo > result;
@@ -2648,14 +2659,14 @@ static PyObject *_wrap_HtmlWinParser_GetLink(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject * HtmlWinParser_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlWinParser_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlWinParser, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *result;
     char *kwnames[] = {
@@ -2677,7 +2688,7 @@ static PyObject *_wrap_new_HtmlTagHandler(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlTagHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2708,7 +2719,7 @@ static PyObject *_wrap_HtmlTagHandler__setCallbackInfo(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlTagHandler_SetParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler_SetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     wxHtmlParser *arg2 = (wxHtmlParser *) 0 ;
@@ -2737,7 +2748,7 @@ static PyObject *_wrap_HtmlTagHandler_SetParser(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlTagHandler_GetParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler_GetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     wxHtmlParser *result;
@@ -2763,7 +2774,7 @@ static PyObject *_wrap_HtmlTagHandler_GetParser(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlTagHandler_ParseInner(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler_ParseInner(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -2797,14 +2808,14 @@ static PyObject *_wrap_HtmlTagHandler_ParseInner(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject * HtmlTagHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlTagHandler_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlTagHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWinTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWinTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *result;
     char *kwnames[] = {
@@ -2826,7 +2837,7 @@ static PyObject *_wrap_new_HtmlWinTagHandler(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2857,7 +2868,7 @@ static PyObject *_wrap_HtmlWinTagHandler__setCallbackInfo(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler_SetParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler_SetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     wxHtmlParser *arg2 = (wxHtmlParser *) 0 ;
@@ -2886,7 +2897,7 @@ static PyObject *_wrap_HtmlWinTagHandler_SetParser(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler_GetParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler_GetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     wxHtmlWinParser *result;
@@ -2912,7 +2923,7 @@ static PyObject *_wrap_HtmlWinTagHandler_GetParser(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler_ParseInner(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler_ParseInner(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -2946,14 +2957,14 @@ static PyObject *_wrap_HtmlWinTagHandler_ParseInner(PyObject *, PyObject *args,
 }
 
 
-static PyObject * HtmlWinTagHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlWinTagHandler_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlWinTagHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlWinParser_AddTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_AddTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2977,7 +2988,7 @@ static PyObject *_wrap_HtmlWinParser_AddTagHandler(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_new_HtmlSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *result;
     char *kwnames[] = {
@@ -2999,7 +3010,7 @@ static PyObject *_wrap_new_HtmlSelection(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_HtmlSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3024,7 +3035,7 @@ static PyObject *_wrap_delete_HtmlSelection(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlSelection_Set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3071,7 +3082,7 @@ static PyObject *_wrap_HtmlSelection_Set(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlSelection_SetCells(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_SetCells(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -3104,7 +3115,7 @@ static PyObject *_wrap_HtmlSelection_SetCells(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetFromCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetFromCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxHtmlCell *result;
@@ -3130,7 +3141,7 @@ static PyObject *_wrap_HtmlSelection_GetFromCell(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetToCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetToCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxHtmlCell *result;
@@ -3156,7 +3167,7 @@ static PyObject *_wrap_HtmlSelection_GetToCell(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetFromPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetFromPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3185,7 +3196,7 @@ static PyObject *_wrap_HtmlSelection_GetFromPos(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetToPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetToPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3214,7 +3225,7 @@ static PyObject *_wrap_HtmlSelection_GetToPos(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetFromPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3243,7 +3254,7 @@ static PyObject *_wrap_HtmlSelection_GetFromPrivPos(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetToPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3272,7 +3283,7 @@ static PyObject *_wrap_HtmlSelection_GetToPrivPos(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlSelection_SetFromPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_SetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3304,7 +3315,7 @@ static PyObject *_wrap_HtmlSelection_SetFromPrivPos(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSelection_SetToPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_SetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3336,7 +3347,7 @@ static PyObject *_wrap_HtmlSelection_SetToPrivPos(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlSelection_ClearPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_ClearPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3361,7 +3372,7 @@ static PyObject *_wrap_HtmlSelection_ClearPrivPos(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     bool result;
@@ -3380,21 +3391,23 @@ static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * HtmlSelection_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlSelection_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlSelection, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlRenderingState(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *result;
     char *kwnames[] = {
@@ -3416,7 +3429,7 @@ static PyObject *_wrap_new_HtmlRenderingState(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_HtmlRenderingState(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3441,7 +3454,7 @@ static PyObject *_wrap_delete_HtmlRenderingState(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     int arg2 ;
@@ -3470,7 +3483,7 @@ static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     int result;
@@ -3496,7 +3509,7 @@ static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_SetFgColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_SetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3528,7 +3541,7 @@ static PyObject *_wrap_HtmlRenderingState_SetFgColour(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_GetFgColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_GetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *result;
@@ -3557,7 +3570,7 @@ static PyObject *_wrap_HtmlRenderingState_GetFgColour(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_SetBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_SetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3589,7 +3602,7 @@ static PyObject *_wrap_HtmlRenderingState_SetBgColour(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_GetBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_GetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *result;
@@ -3618,14 +3631,14 @@ static PyObject *_wrap_HtmlRenderingState_GetBgColour(PyObject *, PyObject *args
 }
 
 
-static PyObject * HtmlRenderingState_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlRenderingState_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlRenderingState, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingStyle *arg1 = (wxHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3662,7 +3675,7 @@ static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextColour(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingStyle *arg1 = (wxHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3699,14 +3712,14 @@ static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextBgColour(PyObject *, Py
 }
 
 
-static PyObject * HtmlRenderingStyle_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlRenderingStyle_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlRenderingStyle, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDefaultHtmlRenderingStyle *arg1 = (wxDefaultHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3743,7 +3756,7 @@ static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject
 }
 
 
-static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDefaultHtmlRenderingStyle *arg1 = (wxDefaultHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3780,14 +3793,14 @@ static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObjec
 }
 
 
-static PyObject * DefaultHtmlRenderingStyle_swigregister(PyObject *, PyObject *args) {
+static PyObject * DefaultHtmlRenderingStyle_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDefaultHtmlRenderingStyle, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlRenderingInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *result;
     char *kwnames[] = {
@@ -3809,7 +3822,7 @@ static PyObject *_wrap_new_HtmlRenderingInfo(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_delete_HtmlRenderingInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3834,7 +3847,7 @@ static PyObject *_wrap_delete_HtmlRenderingInfo(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlSelection *arg2 = (wxHtmlSelection *) 0 ;
@@ -3863,7 +3876,7 @@ static PyObject *_wrap_HtmlRenderingInfo_SetSelection(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlSelection *result;
@@ -3889,7 +3902,7 @@ static PyObject *_wrap_HtmlRenderingInfo_GetSelection(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlRenderingStyle *arg2 = (wxHtmlRenderingStyle *) 0 ;
@@ -3918,7 +3931,7 @@ static PyObject *_wrap_HtmlRenderingInfo_SetStyle(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlRenderingStyle *result;
@@ -3947,7 +3960,7 @@ static PyObject *_wrap_HtmlRenderingInfo_GetStyle(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_GetState(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_GetState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlRenderingState *result;
@@ -3976,14 +3989,14 @@ static PyObject *_wrap_HtmlRenderingInfo_GetState(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * HtmlRenderingInfo_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlRenderingInfo_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlRenderingInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *result;
     char *kwnames[] = {
@@ -4005,7 +4018,7 @@ static PyObject *_wrap_new_HtmlCell(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_HtmlCell_GetPosX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetPosX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4031,7 +4044,7 @@ static PyObject *_wrap_HtmlCell_GetPosX(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlCell_GetPosY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetPosY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4057,7 +4070,7 @@ static PyObject *_wrap_HtmlCell_GetPosY(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlCell_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4083,7 +4096,7 @@ static PyObject *_wrap_HtmlCell_GetWidth(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlCell_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4109,7 +4122,7 @@ static PyObject *_wrap_HtmlCell_GetHeight(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_GetDescent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetDescent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4135,7 +4148,33 @@ static PyObject *_wrap_HtmlCell_GetDescent(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlCell_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetMaxTotalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlCell_GetMaxTotalWidth",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)((wxHtmlCell const *)arg1)->GetMaxTotalWidth();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromInt((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_HtmlCell_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxString *result;
@@ -4170,7 +4209,7 @@ static PyObject *_wrap_HtmlCell_GetId(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_HtmlCell_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxString *arg2 = 0 ;
@@ -4211,7 +4250,7 @@ static PyObject *_wrap_HtmlCell_SetId(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_HtmlCell_GetLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 = (int) 0 ;
@@ -4249,7 +4288,7 @@ static PyObject *_wrap_HtmlCell_GetLink(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlCell_GetNext(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4275,7 +4314,7 @@ static PyObject *_wrap_HtmlCell_GetNext(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlCell_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlContainerCell *result;
@@ -4301,7 +4340,7 @@ static PyObject *_wrap_HtmlCell_GetParent(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_GetFirstChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4327,7 +4366,7 @@ static PyObject *_wrap_HtmlCell_GetFirstChild(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlCell_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxCursor result;
@@ -4357,7 +4396,7 @@ static PyObject *_wrap_HtmlCell_GetCursor(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool result;
@@ -4376,14 +4415,16 @@ static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_SetLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlLinkInfo *arg2 = 0 ;
@@ -4417,7 +4458,7 @@ static PyObject *_wrap_HtmlCell_SetLink(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlCell_SetNext(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -4446,7 +4487,7 @@ static PyObject *_wrap_HtmlCell_SetNext(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlCell_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlContainerCell *arg2 = (wxHtmlContainerCell *) 0 ;
@@ -4475,7 +4516,7 @@ static PyObject *_wrap_HtmlCell_SetParent(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_SetPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4508,7 +4549,7 @@ static PyObject *_wrap_HtmlCell_SetPos(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_HtmlCell_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_Layout(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4537,7 +4578,7 @@ static PyObject *_wrap_HtmlCell_Layout(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_HtmlCell_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxDC *arg2 = 0 ;
@@ -4596,7 +4637,7 @@ static PyObject *_wrap_HtmlCell_Draw(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxDC *arg2 = 0 ;
@@ -4647,7 +4688,7 @@ static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlCell_Find(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_Find(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4680,7 +4721,7 @@ static PyObject *_wrap_HtmlCell_Find(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -4707,7 +4748,9 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         PyObject *o = PyInt_FromLong((long) (*arg2));
         resultobj = t_output_helper(resultobj,o);
@@ -4718,7 +4761,7 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool arg2 ;
@@ -4747,7 +4790,7 @@ static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool result;
@@ -4766,14 +4809,16 @@ static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool result;
@@ -4792,14 +4837,16 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4839,7 +4886,7 @@ static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxPoint result;
@@ -4869,7 +4916,7 @@ static PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_GetFirstTerminal(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetFirstTerminal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4895,7 +4942,7 @@ static PyObject *_wrap_HtmlCell_GetFirstTerminal(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlCell_GetLastTerminal(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetLastTerminal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4921,7 +4968,7 @@ static PyObject *_wrap_HtmlCell_GetLastTerminal(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlCell_GetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     unsigned int result;
@@ -4947,7 +4994,7 @@ static PyObject *_wrap_HtmlCell_GetDepth(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlCell_IsBefore(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -4970,14 +5017,16 @@ static PyObject *_wrap_HtmlCell_IsBefore(PyObject *, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_ConvertToText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_ConvertToText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlSelection *arg2 = (wxHtmlSelection *) 0 ;
@@ -5013,14 +5062,14 @@ static PyObject *_wrap_HtmlCell_ConvertToText(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject * HtmlCell_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlCell_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWordCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWordCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxDC *arg2 = 0 ;
@@ -5067,14 +5116,14 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * HtmlWordCell_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlWordCell_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlWordCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlContainerCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlContainerCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlContainerCell *result;
@@ -5100,7 +5149,7 @@ static PyObject *_wrap_new_HtmlContainerCell(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_InsertCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_InsertCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -5129,7 +5178,7 @@ static PyObject *_wrap_HtmlContainerCell_InsertCell(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5158,7 +5207,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int result;
@@ -5184,7 +5233,7 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5213,7 +5262,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int result;
@@ -5239,7 +5288,7 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5278,7 +5327,7 @@ static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5308,7 +5357,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5338,7 +5387,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -5372,7 +5421,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlign(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5405,7 +5454,7 @@ static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetWidthFloatFromTag(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetWidthFloatFromTag(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -5439,7 +5488,7 @@ static PyObject *_wrap_HtmlContainerCell_SetWidthFloatFromTag(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5474,7 +5523,7 @@ static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxColour *arg2 = 0 ;
@@ -5506,7 +5555,7 @@ static PyObject *_wrap_HtmlContainerCell_SetBackgroundColour(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxColour result;
@@ -5536,7 +5585,7 @@ static PyObject *_wrap_HtmlContainerCell_GetBackgroundColour(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxColour *arg2 = 0 ;
@@ -5575,7 +5624,7 @@ static PyObject *_wrap_HtmlContainerCell_SetBorder(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetFirstChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlCell *result;
@@ -5601,14 +5650,14 @@ static PyObject *_wrap_HtmlContainerCell_GetFirstChild(PyObject *, PyObject *arg
 }
 
 
-static PyObject * HtmlContainerCell_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlContainerCell_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlContainerCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlColourCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlColourCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour arg1 ;
     int arg2 = (int) wxHTML_CLR_FOREGROUND ;
@@ -5642,14 +5691,14 @@ static PyObject *_wrap_new_HtmlColourCell(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject * HtmlColourCell_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlColourCell_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlColourCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlFontCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlFontCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxHtmlFontCell *result;
@@ -5675,14 +5724,14 @@ static PyObject *_wrap_new_HtmlFontCell(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * HtmlFontCell_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlFontCell_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlFontCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWidgetCell(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWidgetCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) 0 ;
@@ -5714,14 +5763,14 @@ static PyObject *_wrap_new_HtmlWidgetCell(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject * HtmlWidgetCell_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlWidgetCell_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlWidgetCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlFilter(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlFilter *result;
     char *kwnames[] = {
@@ -5743,7 +5792,7 @@ static PyObject *_wrap_new_HtmlFilter(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_HtmlFilter__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlFilter__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlFilter *arg1 = (wxPyHtmlFilter *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -5774,14 +5823,14 @@ static PyObject *_wrap_HtmlFilter__setCallbackInfo(PyObject *, PyObject *args, P
 }
 
 
-static PyObject * HtmlFilter_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlFilter_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlFilter, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -5837,11 +5886,12 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *, PyObject *args, PyObject *kwar
         }
     }
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyHtmlWindow *)new wxPyHtmlWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
+        if (PyErr_Occurred()) SWIG_fail;    
     }
     {
         resultobj = wxPyMake_wxObject(result); 
@@ -5860,7 +5910,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_PreHtmlWindow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *result;
     char *kwnames[] = {
@@ -5869,11 +5919,12 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreHtmlWindow",kwnames)) goto fail;
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxPyHtmlWindow *)new wxPyHtmlWindow();
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
+        if (PyErr_Occurred()) SWIG_fail;    
     }
     {
         resultobj = wxPyMake_wxObject(result); 
@@ -5884,7 +5935,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5950,7 +6001,9 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp7)
         delete arg7;
@@ -5965,7 +6018,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlWindow__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -5996,7 +6049,7 @@ static PyObject *_wrap_HtmlWindow__setCallbackInfo(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6023,7 +6076,9 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -6038,7 +6093,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6065,7 +6120,9 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -6080,7 +6137,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6107,7 +6164,9 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -6122,7 +6181,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6149,7 +6208,9 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -6164,7 +6225,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetOpenedPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetOpenedPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -6196,7 +6257,7 @@ static PyObject *_wrap_HtmlWindow_GetOpenedPage(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetOpenedAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetOpenedAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -6228,7 +6289,7 @@ static PyObject *_wrap_HtmlWindow_GetOpenedAnchor(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetOpenedPageTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetOpenedPageTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -6260,7 +6321,7 @@ static PyObject *_wrap_HtmlWindow_GetOpenedPageTitle(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -6305,7 +6366,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetRelatedFrame(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetRelatedFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxFrame *result;
@@ -6333,7 +6394,7 @@ static PyObject *_wrap_HtmlWindow_GetRelatedFrame(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     int arg2 ;
@@ -6362,7 +6423,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString arg2 ;
@@ -6408,7 +6469,7 @@ static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6449,7 +6510,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     int arg2 ;
@@ -6478,7 +6539,7 @@ static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -6517,7 +6578,7 @@ static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -6556,7 +6617,7 @@ static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6575,14 +6636,16 @@ static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6601,14 +6664,16 @@ static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6627,14 +6692,16 @@ static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6653,14 +6720,16 @@ static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryClear(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryClear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6685,7 +6754,7 @@ static PyObject *_wrap_HtmlWindow_HistoryClear(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetInternalRepresentation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetInternalRepresentation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlContainerCell *result;
@@ -6711,7 +6780,7 @@ static PyObject *_wrap_HtmlWindow_GetInternalRepresentation(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetParser(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlWinParser *result;
@@ -6737,7 +6806,7 @@ static PyObject *_wrap_HtmlWindow_GetParser(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6764,7 +6833,9 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -6779,7 +6850,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6806,7 +6877,9 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -6821,7 +6894,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlFilter *arg1 = (wxPyHtmlFilter *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6846,7 +6919,7 @@ static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -6878,7 +6951,7 @@ static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -6910,7 +6983,7 @@ static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6935,7 +7008,7 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlLinkInfo *arg2 = 0 ;
@@ -6969,7 +7042,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -7010,7 +7083,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -7047,7 +7120,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -7093,14 +7166,47 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args,
 }
 
 
-static PyObject * HtmlWindow_swigregister(PyObject *, PyObject *args) {
+static PyObject *_wrap_HtmlWindow_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
+    wxVisualAttributes result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "variant", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:HtmlWindow_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
+    if (obj0) {
+        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        if (!wxPyCheckForApp()) SWIG_fail;
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = wxPyHtmlWindow::GetClassDefaultAttributes((wxWindowVariant )arg1);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;    
+    }
+    {
+        wxVisualAttributes * resultptr;
+        resultptr = new wxVisualAttributes((wxVisualAttributes &) result);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject * HtmlWindow_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlDCRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlDCRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *result;
     char *kwnames[] = {
@@ -7109,11 +7215,12 @@ static PyObject *_wrap_new_HtmlDCRenderer(PyObject *, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_HtmlDCRenderer",kwnames)) goto fail;
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxHtmlDCRenderer *)new wxHtmlDCRenderer();
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
+        if (PyErr_Occurred()) SWIG_fail;    
     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlDCRenderer, 1);
     return resultobj;
@@ -7122,7 +7229,7 @@ static PyObject *_wrap_new_HtmlDCRenderer(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_HtmlDCRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlDCRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7147,7 +7254,7 @@ static PyObject *_wrap_delete_HtmlDCRenderer(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -7180,7 +7287,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     int arg2 ;
@@ -7213,7 +7320,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     wxString *arg2 = 0 ;
@@ -7279,7 +7386,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     wxString arg2 ;
@@ -7325,7 +7432,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     int arg2 ;
@@ -7389,7 +7496,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     int result;
@@ -7415,14 +7522,14 @@ static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *, PyObject *args,
 }
 
 
-static PyObject * HtmlDCRenderer_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlDCRenderer_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlDCRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlPrintout(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyHtmlPrintoutTitleStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -7442,11 +7549,12 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *, PyObject *args, PyObject *kw
         }
     }
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxHtmlPrintout *)new wxHtmlPrintout((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
+        if (PyErr_Occurred()) SWIG_fail;    
     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlPrintout, 1);
     {
@@ -7463,7 +7571,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7529,7 +7637,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7570,7 +7678,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7617,7 +7725,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7664,7 +7772,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString arg2 ;
@@ -7710,7 +7818,7 @@ static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     float arg2 = (float) 25.2 ;
@@ -7765,7 +7873,7 @@ static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlPrintout_AddFilter(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_AddFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlFilter *arg1 = (wxHtmlFilter *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7790,7 +7898,7 @@ static PyObject *_wrap_HtmlPrintout_AddFilter(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlPrintout_CleanUpStatics(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_CleanUpStatics(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -7811,14 +7919,14 @@ static PyObject *_wrap_HtmlPrintout_CleanUpStatics(PyObject *, PyObject *args, P
 }
 
 
-static PyObject * HtmlPrintout_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlPrintout_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlPrintout, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyHtmlPrintingTitleStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -7844,11 +7952,12 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxHtmlEasyPrinting *)new wxHtmlEasyPrinting((wxString const &)*arg1,arg2);
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
+        if (PyErr_Occurred()) SWIG_fail;    
     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlEasyPrinting, 1);
     {
@@ -7865,7 +7974,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlEasyPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7890,7 +7999,7 @@ static PyObject *_wrap_delete_HtmlEasyPrinting(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -7931,7 +8040,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -7991,7 +8100,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8032,7 +8141,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8092,7 +8201,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PrinterSetup(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PrinterSetup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8117,7 +8226,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrinterSetup(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PageSetup(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PageSetup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8142,7 +8251,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PageSetup(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8189,7 +8298,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8236,7 +8345,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString arg2 ;
@@ -8282,7 +8391,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_GetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxPrintData *result;
@@ -8308,7 +8417,7 @@ static PyObject *_wrap_HtmlEasyPrinting_GetPrintData(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_GetPageSetupData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_GetPageSetupData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxPageSetupDialogData *result;
@@ -8334,14 +8443,14 @@ static PyObject *_wrap_HtmlEasyPrinting_GetPageSetupData(PyObject *, PyObject *a
 }
 
 
-static PyObject * HtmlEasyPrinting_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlEasyPrinting_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlEasyPrinting, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlBookRecord(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlBookRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -8427,7 +8536,7 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetBookFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetBookFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8459,7 +8568,7 @@ static PyObject *_wrap_HtmlBookRecord_GetBookFile(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8491,7 +8600,7 @@ static PyObject *_wrap_HtmlBookRecord_GetTitle(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetStart(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetStart(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8523,7 +8632,7 @@ static PyObject *_wrap_HtmlBookRecord_GetStart(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetBasePath(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetBasePath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8555,7 +8664,7 @@ static PyObject *_wrap_HtmlBookRecord_GetBasePath(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     int arg2 ;
@@ -8588,7 +8697,7 @@ static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     int result;
@@ -8614,7 +8723,7 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     int result;
@@ -8640,7 +8749,7 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -8681,7 +8790,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -8722,7 +8831,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -8763,7 +8872,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -8811,14 +8920,14 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * HtmlBookRecord_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlBookRecord_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlBookRecord, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     int result;
@@ -8844,7 +8953,7 @@ static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     int result;
@@ -8870,7 +8979,7 @@ static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     wxString result;
@@ -8902,7 +9011,7 @@ static PyObject *_wrap_HtmlContentsItem_GetName(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetPage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     wxString result;
@@ -8934,7 +9043,7 @@ static PyObject *_wrap_HtmlContentsItem_GetPage(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetBook(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetBook(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     wxHtmlBookRecord *result;
@@ -8960,14 +9069,14 @@ static PyObject *_wrap_HtmlContentsItem_GetBook(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * HtmlContentsItem_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlContentsItem_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlContentsItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     bool result;
@@ -8986,14 +9095,16 @@ static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     bool result;
@@ -9012,14 +9123,16 @@ static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     int result;
@@ -9045,7 +9158,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     int result;
@@ -9071,7 +9184,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     wxString *result;
@@ -9106,7 +9219,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetName(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetContentsItem(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetContentsItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     wxHtmlContentsItem *result;
@@ -9132,14 +9245,14 @@ static PyObject *_wrap_HtmlSearchStatus_GetContentsItem(PyObject *, PyObject *ar
 }
 
 
-static PyObject * HtmlSearchStatus_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlSearchStatus_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlSearchStatus, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlHelpData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlHelpData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *result;
     char *kwnames[] = {
@@ -9161,7 +9274,7 @@ static PyObject *_wrap_new_HtmlHelpData(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_HtmlHelpData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlHelpData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9186,7 +9299,7 @@ static PyObject *_wrap_delete_HtmlHelpData(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
@@ -9227,7 +9340,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
@@ -9254,7 +9367,9 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -9269,7 +9384,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
@@ -9317,7 +9432,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     int arg2 ;
@@ -9353,7 +9468,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetBookRecArray(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetBookRecArray(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxHtmlBookRecArray *result;
@@ -9382,7 +9497,7 @@ static PyObject *_wrap_HtmlHelpData_GetBookRecArray(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxHtmlContentsItem *result;
@@ -9408,7 +9523,7 @@ static PyObject *_wrap_HtmlHelpData_GetContents(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     int result;
@@ -9434,7 +9549,7 @@ static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetIndex(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxHtmlContentsItem *result;
@@ -9460,7 +9575,7 @@ static PyObject *_wrap_HtmlHelpData_GetIndex(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     int result;
@@ -9486,14 +9601,14 @@ static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * HtmlHelpData_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlHelpData_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlHelpData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlHelpFrame(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -9533,11 +9648,12 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *, PyObject *args, PyObject *k
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxHtmlHelpFrame *)new wxHtmlHelpFrame(arg1,arg2,(wxString const &)*arg3,arg4,arg5);
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
+        if (PyErr_Occurred()) SWIG_fail;    
     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlHelpFrame, 1);
     {
@@ -9554,7 +9670,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxHtmlHelpData *result;
@@ -9580,7 +9696,7 @@ static PyObject *_wrap_HtmlHelpFrame_GetData(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -9621,7 +9737,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -9662,7 +9778,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     int arg2 ;
@@ -9691,7 +9807,7 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_DisplayContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_DisplayContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9716,7 +9832,7 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayContents(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_DisplayIndex(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_DisplayIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9741,7 +9857,7 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayIndex(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -9768,7 +9884,9 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -9783,7 +9901,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -9831,7 +9949,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -9870,7 +9988,7 @@ static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -9909,14 +10027,14 @@ static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *, PyObject *ar
 }
 
 
-static PyObject * HtmlHelpFrame_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlHelpFrame_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlHelpFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlHelpController(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlHelpController(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxHF_DEFAULTSTYLE ;
     wxHtmlHelpController *result;
@@ -9931,11 +10049,12 @@ static PyObject *_wrap_new_HtmlHelpController(PyObject *, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
+        if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = (wxHtmlHelpController *)new wxHtmlHelpController(arg1);
         
         wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
+        if (PyErr_Occurred()) SWIG_fail;    
     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlHelpController, 1);
     return resultobj;
@@ -9944,7 +10063,7 @@ static PyObject *_wrap_new_HtmlHelpController(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_HtmlHelpController(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlHelpController(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9969,7 +10088,7 @@ static PyObject *_wrap_delete_HtmlHelpController(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10010,7 +10129,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10051,7 +10170,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10084,7 +10203,9 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -10099,7 +10220,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlHelpController_Display(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_Display(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10140,7 +10261,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     int arg2 ;
@@ -10169,7 +10290,7 @@ static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpController_DisplayContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_DisplayContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10194,7 +10315,7 @@ static PyObject *_wrap_HtmlHelpController_DisplayContents(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlHelpController_DisplayIndex(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_DisplayIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10219,7 +10340,7 @@ static PyObject *_wrap_HtmlHelpController_DisplayIndex(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10246,7 +10367,9 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -10261,7 +10384,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10309,7 +10432,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10348,7 +10471,7 @@ static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10387,7 +10510,7 @@ static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlHelpController_GetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxHtmlHelpFrame *result;
@@ -10413,7 +10536,7 @@ static PyObject *_wrap_HtmlHelpController_GetFrame(PyObject *, PyObject *args, P
 }
 
 
-static PyObject * HtmlHelpController_swigregister(PyObject *, PyObject *args) {
+static PyObject * HtmlHelpController_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlHelpController, obj);
@@ -10421,316 +10544,318 @@ static PyObject * HtmlHelpController_swigregister(PyObject *, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-	 { (char *)"new_HtmlLinkInfo", (PyCFunction) _wrap_new_HtmlLinkInfo, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlLinkInfo_GetHref", (PyCFunction) _wrap_HtmlLinkInfo_GetHref, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlLinkInfo_GetTarget", (PyCFunction) _wrap_HtmlLinkInfo_GetTarget, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlLinkInfo_GetEvent", (PyCFunction) _wrap_HtmlLinkInfo_GetEvent, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlLinkInfo_GetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_GetHtmlCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlLinkInfo_SetEvent", (PyCFunction) _wrap_HtmlLinkInfo_SetEvent, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlLinkInfo_SetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_SetHtmlCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlLinkInfo_swigregister", HtmlLinkInfo_swigregister, METH_VARARGS, NULL },
-	 { (char *)"HtmlTag_GetName", (PyCFunction) _wrap_HtmlTag_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_HasParam", (PyCFunction) _wrap_HtmlTag_HasParam, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_GetParam", (PyCFunction) _wrap_HtmlTag_GetParam, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_GetAllParams", (PyCFunction) _wrap_HtmlTag_GetAllParams, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_HasEnding", (PyCFunction) _wrap_HtmlTag_HasEnding, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_GetBeginPos", (PyCFunction) _wrap_HtmlTag_GetBeginPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_GetEndPos1", (PyCFunction) _wrap_HtmlTag_GetEndPos1, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_GetEndPos2", (PyCFunction) _wrap_HtmlTag_GetEndPos2, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTag_swigregister", HtmlTag_swigregister, METH_VARARGS, NULL },
-	 { (char *)"HtmlParser_SetFS", (PyCFunction) _wrap_HtmlParser_SetFS, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_GetFS", (PyCFunction) _wrap_HtmlParser_GetFS, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_Parse", (PyCFunction) _wrap_HtmlParser_Parse, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_InitParser", (PyCFunction) _wrap_HtmlParser_InitParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_DoneParser", (PyCFunction) _wrap_HtmlParser_DoneParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_DoParsing", (PyCFunction) _wrap_HtmlParser_DoParsing, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_StopParsing", (PyCFunction) _wrap_HtmlParser_StopParsing, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_AddTagHandler", (PyCFunction) _wrap_HtmlParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_GetSource", (PyCFunction) _wrap_HtmlParser_GetSource, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_PopTagHandler", (PyCFunction) _wrap_HtmlParser_PopTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetDC", (PyCFunction) _wrap_HtmlWinParser_GetDC, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction) _wrap_HtmlWinParser_GetCharHeight, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (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_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 },
-	 { (char *)"HtmlWinParser_CloseContainer", (PyCFunction) _wrap_HtmlWinParser_CloseContainer, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetFontSize", (PyCFunction) _wrap_HtmlWinParser_GetFontSize, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetFontSize", (PyCFunction) _wrap_HtmlWinParser_SetFontSize, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetFontBold", (PyCFunction) _wrap_HtmlWinParser_GetFontBold, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetFontBold", (PyCFunction) _wrap_HtmlWinParser_SetFontBold, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetFontItalic", (PyCFunction) _wrap_HtmlWinParser_GetFontItalic, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetFontItalic", (PyCFunction) _wrap_HtmlWinParser_SetFontItalic, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_GetFontUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_SetFontUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetFontFixed", (PyCFunction) _wrap_HtmlWinParser_GetFontFixed, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetFontFixed", (PyCFunction) _wrap_HtmlWinParser_SetFontFixed, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetAlign", (PyCFunction) _wrap_HtmlWinParser_GetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetAlign", (PyCFunction) _wrap_HtmlWinParser_SetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetLinkColor", (PyCFunction) _wrap_HtmlWinParser_GetLinkColor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetLinkColor", (PyCFunction) _wrap_HtmlWinParser_SetLinkColor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetActualColor", (PyCFunction) _wrap_HtmlWinParser_GetActualColor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetActualColor", (PyCFunction) _wrap_HtmlWinParser_SetActualColor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_SetLink", (PyCFunction) _wrap_HtmlWinParser_SetLink, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_CreateCurrentFont", (PyCFunction) _wrap_HtmlWinParser_CreateCurrentFont, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_GetLink", (PyCFunction) _wrap_HtmlWinParser_GetLink, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinParser_swigregister", HtmlWinParser_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlTagHandler", (PyCFunction) _wrap_new_HtmlTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTagHandler_SetParser", (PyCFunction) _wrap_HtmlTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTagHandler_GetParser", (PyCFunction) _wrap_HtmlTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTagHandler_ParseInner", (PyCFunction) _wrap_HtmlTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlTagHandler_swigregister", HtmlTagHandler_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlWinTagHandler", (PyCFunction) _wrap_new_HtmlWinTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlWinTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinTagHandler_SetParser", (PyCFunction) _wrap_HtmlWinTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinTagHandler_GetParser", (PyCFunction) _wrap_HtmlWinTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinTagHandler_ParseInner", (PyCFunction) _wrap_HtmlWinTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWinTagHandler_swigregister", HtmlWinTagHandler_swigregister, METH_VARARGS, NULL },
-	 { (char *)"HtmlWinParser_AddTagHandler", (PyCFunction) _wrap_HtmlWinParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"new_HtmlSelection", (PyCFunction) _wrap_new_HtmlSelection, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"delete_HtmlSelection", (PyCFunction) _wrap_delete_HtmlSelection, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_Set", (PyCFunction) _wrap_HtmlSelection_Set, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_SetCells", (PyCFunction) _wrap_HtmlSelection_SetCells, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_GetFromCell", (PyCFunction) _wrap_HtmlSelection_GetFromCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_GetToCell", (PyCFunction) _wrap_HtmlSelection_GetToCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_GetFromPos", (PyCFunction) _wrap_HtmlSelection_GetFromPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_GetToPos", (PyCFunction) _wrap_HtmlSelection_GetToPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_GetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_GetFromPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_GetToPrivPos", (PyCFunction) _wrap_HtmlSelection_GetToPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_SetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_SetFromPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_SetToPrivPos", (PyCFunction) _wrap_HtmlSelection_SetToPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_ClearPrivPos", (PyCFunction) _wrap_HtmlSelection_ClearPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_IsEmpty", (PyCFunction) _wrap_HtmlSelection_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSelection_swigregister", HtmlSelection_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlRenderingState", (PyCFunction) _wrap_new_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"delete_HtmlRenderingState", (PyCFunction) _wrap_delete_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingState_SetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_SetSelectionState, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingState_GetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_GetSelectionState, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingState_SetFgColour", (PyCFunction) _wrap_HtmlRenderingState_SetFgColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingState_GetFgColour", (PyCFunction) _wrap_HtmlRenderingState_GetFgColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingState_SetBgColour", (PyCFunction) _wrap_HtmlRenderingState_SetBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingState_GetBgColour", (PyCFunction) _wrap_HtmlRenderingState_GetBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingState_swigregister", HtmlRenderingState_swigregister, METH_VARARGS, NULL },
-	 { (char *)"HtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingStyle_swigregister", HtmlRenderingStyle_swigregister, METH_VARARGS, NULL },
-	 { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"DefaultHtmlRenderingStyle_swigregister", DefaultHtmlRenderingStyle_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlRenderingInfo", (PyCFunction) _wrap_new_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"delete_HtmlRenderingInfo", (PyCFunction) _wrap_delete_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingInfo_SetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingInfo_GetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingInfo_SetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingInfo_GetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingInfo_GetState", (PyCFunction) _wrap_HtmlRenderingInfo_GetState, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlRenderingInfo_swigregister", HtmlRenderingInfo_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlCell", (PyCFunction) _wrap_new_HtmlCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetPosX", (PyCFunction) _wrap_HtmlCell_GetPosX, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetPosY", (PyCFunction) _wrap_HtmlCell_GetPosY, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetWidth", (PyCFunction) _wrap_HtmlCell_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetHeight", (PyCFunction) _wrap_HtmlCell_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetDescent", (PyCFunction) _wrap_HtmlCell_GetDescent, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetId", (PyCFunction) _wrap_HtmlCell_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_SetId", (PyCFunction) _wrap_HtmlCell_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetLink", (PyCFunction) _wrap_HtmlCell_GetLink, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetNext", (PyCFunction) _wrap_HtmlCell_GetNext, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetParent", (PyCFunction) _wrap_HtmlCell_GetParent, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetFirstChild", (PyCFunction) _wrap_HtmlCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetCursor", (PyCFunction) _wrap_HtmlCell_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_IsFormattingCell", (PyCFunction) _wrap_HtmlCell_IsFormattingCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_SetNext", (PyCFunction) _wrap_HtmlCell_SetNext, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_SetParent", (PyCFunction) _wrap_HtmlCell_SetParent, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_SetPos", (PyCFunction) _wrap_HtmlCell_SetPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_Layout", (PyCFunction) _wrap_HtmlCell_Layout, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction) _wrap_HtmlCell_IsLinebreakAllowed, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_IsTerminalCell", (PyCFunction) _wrap_HtmlCell_IsTerminalCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetAbsPos", (PyCFunction) _wrap_HtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction) _wrap_HtmlCell_GetFirstTerminal, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetLastTerminal", (PyCFunction) _wrap_HtmlCell_GetLastTerminal, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_GetDepth", (PyCFunction) _wrap_HtmlCell_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_IsBefore", (PyCFunction) _wrap_HtmlCell_IsBefore, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_ConvertToText", (PyCFunction) _wrap_HtmlCell_ConvertToText, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlCell_swigregister", HtmlCell_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlWordCell", (PyCFunction) _wrap_new_HtmlWordCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWordCell_swigregister", HtmlWordCell_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlContainerCell", (PyCFunction) _wrap_new_HtmlContainerCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_InsertCell", (PyCFunction) _wrap_HtmlContainerCell_InsertCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_SetAlignHor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_GetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_GetAlignHor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_SetAlignVer, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_GetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_GetAlignVer, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetIndent", (PyCFunction) _wrap_HtmlContainerCell_SetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_GetIndent", (PyCFunction) _wrap_HtmlContainerCell_GetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_GetIndentUnits", (PyCFunction) _wrap_HtmlContainerCell_GetIndentUnits, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetAlign", (PyCFunction) _wrap_HtmlContainerCell_SetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetWidthFloat", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloat, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetWidthFloatFromTag", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloatFromTag, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetMinHeight", (PyCFunction) _wrap_HtmlContainerCell_SetMinHeight, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_GetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_SetBorder", (PyCFunction) _wrap_HtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_GetFirstChild", (PyCFunction) _wrap_HtmlContainerCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContainerCell_swigregister", HtmlContainerCell_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlColourCell", (PyCFunction) _wrap_new_HtmlColourCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlColourCell_swigregister", HtmlColourCell_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlFontCell", (PyCFunction) _wrap_new_HtmlFontCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlFontCell_swigregister", HtmlFontCell_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlWidgetCell", (PyCFunction) _wrap_new_HtmlWidgetCell, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWidgetCell_swigregister", HtmlWidgetCell_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlFilter", (PyCFunction) _wrap_new_HtmlFilter, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"new_PreHtmlWindow", (PyCFunction) _wrap_new_PreHtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow__setCallbackInfo", (PyCFunction) _wrap_HtmlWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_SetPage", (PyCFunction) _wrap_HtmlWindow_SetPage, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_LoadPage", (PyCFunction) _wrap_HtmlWindow_LoadPage, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_LoadFile", (PyCFunction) _wrap_HtmlWindow_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_AppendToPage", (PyCFunction) _wrap_HtmlWindow_AppendToPage, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_GetOpenedPage", (PyCFunction) _wrap_HtmlWindow_GetOpenedPage, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_GetOpenedAnchor", (PyCFunction) _wrap_HtmlWindow_GetOpenedAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_GetOpenedPageTitle", (PyCFunction) _wrap_HtmlWindow_GetOpenedPageTitle, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_SetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_SetRelatedFrame, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (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_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 },
-	 { (char *)"HtmlWindow_WriteCustomization", (PyCFunction) _wrap_HtmlWindow_WriteCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_HistoryBack", (PyCFunction) _wrap_HtmlWindow_HistoryBack, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_HistoryForward", (PyCFunction) _wrap_HtmlWindow_HistoryForward, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_HistoryCanBack", (PyCFunction) _wrap_HtmlWindow_HistoryCanBack, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_HistoryCanForward", (PyCFunction) _wrap_HtmlWindow_HistoryCanForward, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_HistoryClear", (PyCFunction) _wrap_HtmlWindow_HistoryClear, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_GetInternalRepresentation", (PyCFunction) _wrap_HtmlWindow_GetInternalRepresentation, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_GetParser", (PyCFunction) _wrap_HtmlWindow_GetParser, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_ScrollToAnchor", (PyCFunction) _wrap_HtmlWindow_ScrollToAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_HasAnchor", (PyCFunction) _wrap_HtmlWindow_HasAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_AddFilter", (PyCFunction) _wrap_HtmlWindow_AddFilter, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_base_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_base_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlDCRenderer", (PyCFunction) _wrap_new_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"delete_HtmlDCRenderer", (PyCFunction) _wrap_delete_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlDCRenderer_SetDC", (PyCFunction) _wrap_HtmlDCRenderer_SetDC, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (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_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 },
-	 { (char *)"new_HtmlPrintout", (PyCFunction) _wrap_new_HtmlPrintout, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlPrintout_SetHtmlText", (PyCFunction) _wrap_HtmlPrintout_SetHtmlText, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlPrintout_SetHtmlFile", (PyCFunction) _wrap_HtmlPrintout_SetHtmlFile, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (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_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 },
-	 { (char *)"HtmlPrintout_swigregister", HtmlPrintout_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlEasyPrinting", (PyCFunction) _wrap_new_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"delete_HtmlEasyPrinting", (PyCFunction) _wrap_delete_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlEasyPrinting_PreviewFile", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewFile, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlEasyPrinting_PreviewText", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewText, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlEasyPrinting_PrintFile", (PyCFunction) _wrap_HtmlEasyPrinting_PrintFile, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlEasyPrinting_PrintText", (PyCFunction) _wrap_HtmlEasyPrinting_PrintText, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlEasyPrinting_PrinterSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PrinterSetup, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlEasyPrinting_PageSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PageSetup, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (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_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 },
-	 { (char *)"new_HtmlBookRecord", (PyCFunction) _wrap_new_HtmlBookRecord, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_GetBookFile", (PyCFunction) _wrap_HtmlBookRecord_GetBookFile, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_GetTitle", (PyCFunction) _wrap_HtmlBookRecord_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_GetStart", (PyCFunction) _wrap_HtmlBookRecord_GetStart, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_GetBasePath", (PyCFunction) _wrap_HtmlBookRecord_GetBasePath, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_SetContentsRange", (PyCFunction) _wrap_HtmlBookRecord_SetContentsRange, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_GetContentsStart", (PyCFunction) _wrap_HtmlBookRecord_GetContentsStart, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_GetContentsEnd", (PyCFunction) _wrap_HtmlBookRecord_GetContentsEnd, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_SetTitle", (PyCFunction) _wrap_HtmlBookRecord_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_SetBasePath", (PyCFunction) _wrap_HtmlBookRecord_SetBasePath, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_SetStart", (PyCFunction) _wrap_HtmlBookRecord_SetStart, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_GetFullPath", (PyCFunction) _wrap_HtmlBookRecord_GetFullPath, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlBookRecord_swigregister", HtmlBookRecord_swigregister, METH_VARARGS, NULL },
-	 { (char *)"HtmlContentsItem_GetLevel", (PyCFunction) _wrap_HtmlContentsItem_GetLevel, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContentsItem_GetID", (PyCFunction) _wrap_HtmlContentsItem_GetID, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContentsItem_GetName", (PyCFunction) _wrap_HtmlContentsItem_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContentsItem_GetPage", (PyCFunction) _wrap_HtmlContentsItem_GetPage, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContentsItem_GetBook", (PyCFunction) _wrap_HtmlContentsItem_GetBook, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlContentsItem_swigregister", HtmlContentsItem_swigregister, METH_VARARGS, NULL },
-	 { (char *)"HtmlSearchStatus_Search", (PyCFunction) _wrap_HtmlSearchStatus_Search, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSearchStatus_IsActive", (PyCFunction) _wrap_HtmlSearchStatus_IsActive, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSearchStatus_GetCurIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetCurIndex, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSearchStatus_GetMaxIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetMaxIndex, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSearchStatus_GetName", (PyCFunction) _wrap_HtmlSearchStatus_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSearchStatus_GetContentsItem", (PyCFunction) _wrap_HtmlSearchStatus_GetContentsItem, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlSearchStatus_swigregister", HtmlSearchStatus_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlHelpData", (PyCFunction) _wrap_new_HtmlHelpData, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"delete_HtmlHelpData", (PyCFunction) _wrap_delete_HtmlHelpData, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_SetTempDir", (PyCFunction) _wrap_HtmlHelpData_SetTempDir, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_AddBook", (PyCFunction) _wrap_HtmlHelpData_AddBook, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_FindPageByName", (PyCFunction) _wrap_HtmlHelpData_FindPageByName, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_FindPageById", (PyCFunction) _wrap_HtmlHelpData_FindPageById, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_GetBookRecArray", (PyCFunction) _wrap_HtmlHelpData_GetBookRecArray, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_GetContents", (PyCFunction) _wrap_HtmlHelpData_GetContents, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_GetContentsCnt", (PyCFunction) _wrap_HtmlHelpData_GetContentsCnt, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_GetIndex", (PyCFunction) _wrap_HtmlHelpData_GetIndex, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_GetIndexCnt", (PyCFunction) _wrap_HtmlHelpData_GetIndexCnt, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpData_swigregister", HtmlHelpData_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_GetData", (PyCFunction) _wrap_HtmlHelpFrame_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpFrame_SetTitleFormat, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_Display", (PyCFunction) _wrap_HtmlHelpFrame_Display, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_DisplayID", (PyCFunction) _wrap_HtmlHelpFrame_DisplayID, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_DisplayContents", (PyCFunction) _wrap_HtmlHelpFrame_DisplayContents, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_DisplayIndex", (PyCFunction) _wrap_HtmlHelpFrame_DisplayIndex, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_KeywordSearch", (PyCFunction) _wrap_HtmlHelpFrame_KeywordSearch, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_UseConfig", (PyCFunction) _wrap_HtmlHelpFrame_UseConfig, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_ReadCustomization", (PyCFunction) _wrap_HtmlHelpFrame_ReadCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_WriteCustomization", (PyCFunction) _wrap_HtmlHelpFrame_WriteCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpFrame_swigregister", HtmlHelpFrame_swigregister, METH_VARARGS, NULL },
-	 { (char *)"new_HtmlHelpController", (PyCFunction) _wrap_new_HtmlHelpController, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"delete_HtmlHelpController", (PyCFunction) _wrap_delete_HtmlHelpController, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpController_SetTitleFormat, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_SetTempDir", (PyCFunction) _wrap_HtmlHelpController_SetTempDir, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_AddBook", (PyCFunction) _wrap_HtmlHelpController_AddBook, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_Display", (PyCFunction) _wrap_HtmlHelpController_Display, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_DisplayID", (PyCFunction) _wrap_HtmlHelpController_DisplayID, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_DisplayContents", (PyCFunction) _wrap_HtmlHelpController_DisplayContents, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_DisplayIndex", (PyCFunction) _wrap_HtmlHelpController_DisplayIndex, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_KeywordSearch", (PyCFunction) _wrap_HtmlHelpController_KeywordSearch, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_UseConfig", (PyCFunction) _wrap_HtmlHelpController_UseConfig, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_ReadCustomization", (PyCFunction) _wrap_HtmlHelpController_ReadCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_WriteCustomization", (PyCFunction) _wrap_HtmlHelpController_WriteCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_GetFrame", (PyCFunction) _wrap_HtmlHelpController_GetFrame, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"HtmlHelpController_swigregister", HtmlHelpController_swigregister, METH_VARARGS, NULL },
-	 { NULL, NULL, 0, NULL }
+	 { (char *)"new_HtmlLinkInfo", (PyCFunction) _wrap_new_HtmlLinkInfo, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlLinkInfo_GetHref", (PyCFunction) _wrap_HtmlLinkInfo_GetHref, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlLinkInfo_GetTarget", (PyCFunction) _wrap_HtmlLinkInfo_GetTarget, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlLinkInfo_GetEvent", (PyCFunction) _wrap_HtmlLinkInfo_GetEvent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlLinkInfo_GetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_GetHtmlCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlLinkInfo_SetEvent", (PyCFunction) _wrap_HtmlLinkInfo_SetEvent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlLinkInfo_SetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_SetHtmlCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlLinkInfo_swigregister", HtmlLinkInfo_swigregister, METH_VARARGS },
+	 { (char *)"HtmlTag_GetName", (PyCFunction) _wrap_HtmlTag_GetName, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_HasParam", (PyCFunction) _wrap_HtmlTag_HasParam, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_GetParam", (PyCFunction) _wrap_HtmlTag_GetParam, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_GetAllParams", (PyCFunction) _wrap_HtmlTag_GetAllParams, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_HasEnding", (PyCFunction) _wrap_HtmlTag_HasEnding, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_GetBeginPos", (PyCFunction) _wrap_HtmlTag_GetBeginPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_GetEndPos1", (PyCFunction) _wrap_HtmlTag_GetEndPos1, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_GetEndPos2", (PyCFunction) _wrap_HtmlTag_GetEndPos2, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTag_swigregister", HtmlTag_swigregister, METH_VARARGS },
+	 { (char *)"HtmlParser_SetFS", (PyCFunction) _wrap_HtmlParser_SetFS, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_GetFS", (PyCFunction) _wrap_HtmlParser_GetFS, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_Parse", (PyCFunction) _wrap_HtmlParser_Parse, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_InitParser", (PyCFunction) _wrap_HtmlParser_InitParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_DoneParser", (PyCFunction) _wrap_HtmlParser_DoneParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_DoParsing", (PyCFunction) _wrap_HtmlParser_DoParsing, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_StopParsing", (PyCFunction) _wrap_HtmlParser_StopParsing, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_AddTagHandler", (PyCFunction) _wrap_HtmlParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_GetSource", (PyCFunction) _wrap_HtmlParser_GetSource, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_PopTagHandler", (PyCFunction) _wrap_HtmlParser_PopTagHandler, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetDC", (PyCFunction) _wrap_HtmlWinParser_GetDC, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction) _wrap_HtmlWinParser_GetCharHeight, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction) _wrap_HtmlWinParser_GetCharWidth, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetWindow", (PyCFunction) _wrap_HtmlWinParser_GetWindow, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetContainer", (PyCFunction) _wrap_HtmlWinParser_GetContainer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_OpenContainer", (PyCFunction) _wrap_HtmlWinParser_OpenContainer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetContainer", (PyCFunction) _wrap_HtmlWinParser_SetContainer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_CloseContainer", (PyCFunction) _wrap_HtmlWinParser_CloseContainer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetFontSize", (PyCFunction) _wrap_HtmlWinParser_GetFontSize, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetFontSize", (PyCFunction) _wrap_HtmlWinParser_SetFontSize, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetFontBold", (PyCFunction) _wrap_HtmlWinParser_GetFontBold, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetFontBold", (PyCFunction) _wrap_HtmlWinParser_SetFontBold, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetFontItalic", (PyCFunction) _wrap_HtmlWinParser_GetFontItalic, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetFontItalic", (PyCFunction) _wrap_HtmlWinParser_SetFontItalic, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_GetFontUnderlined, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_SetFontUnderlined, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetFontFixed", (PyCFunction) _wrap_HtmlWinParser_GetFontFixed, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetFontFixed", (PyCFunction) _wrap_HtmlWinParser_SetFontFixed, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetAlign", (PyCFunction) _wrap_HtmlWinParser_GetAlign, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetAlign", (PyCFunction) _wrap_HtmlWinParser_SetAlign, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetLinkColor", (PyCFunction) _wrap_HtmlWinParser_GetLinkColor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetLinkColor", (PyCFunction) _wrap_HtmlWinParser_SetLinkColor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetActualColor", (PyCFunction) _wrap_HtmlWinParser_GetActualColor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetActualColor", (PyCFunction) _wrap_HtmlWinParser_SetActualColor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_SetLink", (PyCFunction) _wrap_HtmlWinParser_SetLink, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_CreateCurrentFont", (PyCFunction) _wrap_HtmlWinParser_CreateCurrentFont, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_GetLink", (PyCFunction) _wrap_HtmlWinParser_GetLink, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinParser_swigregister", HtmlWinParser_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlTagHandler", (PyCFunction) _wrap_new_HtmlTagHandler, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTagHandler_SetParser", (PyCFunction) _wrap_HtmlTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTagHandler_GetParser", (PyCFunction) _wrap_HtmlTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTagHandler_ParseInner", (PyCFunction) _wrap_HtmlTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlTagHandler_swigregister", HtmlTagHandler_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlWinTagHandler", (PyCFunction) _wrap_new_HtmlWinTagHandler, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlWinTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinTagHandler_SetParser", (PyCFunction) _wrap_HtmlWinTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinTagHandler_GetParser", (PyCFunction) _wrap_HtmlWinTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinTagHandler_ParseInner", (PyCFunction) _wrap_HtmlWinTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWinTagHandler_swigregister", HtmlWinTagHandler_swigregister, METH_VARARGS },
+	 { (char *)"HtmlWinParser_AddTagHandler", (PyCFunction) _wrap_HtmlWinParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_HtmlSelection", (PyCFunction) _wrap_new_HtmlSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_HtmlSelection", (PyCFunction) _wrap_delete_HtmlSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_Set", (PyCFunction) _wrap_HtmlSelection_Set, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_SetCells", (PyCFunction) _wrap_HtmlSelection_SetCells, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_GetFromCell", (PyCFunction) _wrap_HtmlSelection_GetFromCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_GetToCell", (PyCFunction) _wrap_HtmlSelection_GetToCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_GetFromPos", (PyCFunction) _wrap_HtmlSelection_GetFromPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_GetToPos", (PyCFunction) _wrap_HtmlSelection_GetToPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_GetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_GetFromPrivPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_GetToPrivPos", (PyCFunction) _wrap_HtmlSelection_GetToPrivPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_SetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_SetFromPrivPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_SetToPrivPos", (PyCFunction) _wrap_HtmlSelection_SetToPrivPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_ClearPrivPos", (PyCFunction) _wrap_HtmlSelection_ClearPrivPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_IsEmpty", (PyCFunction) _wrap_HtmlSelection_IsEmpty, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSelection_swigregister", HtmlSelection_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlRenderingState", (PyCFunction) _wrap_new_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_HtmlRenderingState", (PyCFunction) _wrap_delete_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingState_SetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_SetSelectionState, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingState_GetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_GetSelectionState, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingState_SetFgColour", (PyCFunction) _wrap_HtmlRenderingState_SetFgColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingState_GetFgColour", (PyCFunction) _wrap_HtmlRenderingState_GetFgColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingState_SetBgColour", (PyCFunction) _wrap_HtmlRenderingState_SetBgColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingState_GetBgColour", (PyCFunction) _wrap_HtmlRenderingState_GetBgColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingState_swigregister", HtmlRenderingState_swigregister, METH_VARARGS },
+	 { (char *)"HtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingStyle_swigregister", HtmlRenderingStyle_swigregister, METH_VARARGS },
+	 { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DefaultHtmlRenderingStyle_swigregister", DefaultHtmlRenderingStyle_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlRenderingInfo", (PyCFunction) _wrap_new_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_HtmlRenderingInfo", (PyCFunction) _wrap_delete_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingInfo_SetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingInfo_GetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingInfo_SetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_SetStyle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingInfo_GetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_GetStyle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingInfo_GetState", (PyCFunction) _wrap_HtmlRenderingInfo_GetState, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlRenderingInfo_swigregister", HtmlRenderingInfo_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlCell", (PyCFunction) _wrap_new_HtmlCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetPosX", (PyCFunction) _wrap_HtmlCell_GetPosX, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetPosY", (PyCFunction) _wrap_HtmlCell_GetPosY, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetWidth", (PyCFunction) _wrap_HtmlCell_GetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetHeight", (PyCFunction) _wrap_HtmlCell_GetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetDescent", (PyCFunction) _wrap_HtmlCell_GetDescent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetMaxTotalWidth", (PyCFunction) _wrap_HtmlCell_GetMaxTotalWidth, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetId", (PyCFunction) _wrap_HtmlCell_GetId, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_SetId", (PyCFunction) _wrap_HtmlCell_SetId, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetLink", (PyCFunction) _wrap_HtmlCell_GetLink, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetNext", (PyCFunction) _wrap_HtmlCell_GetNext, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetParent", (PyCFunction) _wrap_HtmlCell_GetParent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetFirstChild", (PyCFunction) _wrap_HtmlCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetCursor", (PyCFunction) _wrap_HtmlCell_GetCursor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_IsFormattingCell", (PyCFunction) _wrap_HtmlCell_IsFormattingCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_SetNext", (PyCFunction) _wrap_HtmlCell_SetNext, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_SetParent", (PyCFunction) _wrap_HtmlCell_SetParent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_SetPos", (PyCFunction) _wrap_HtmlCell_SetPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_Layout", (PyCFunction) _wrap_HtmlCell_Layout, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction) _wrap_HtmlCell_IsLinebreakAllowed, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_IsTerminalCell", (PyCFunction) _wrap_HtmlCell_IsTerminalCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetAbsPos", (PyCFunction) _wrap_HtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction) _wrap_HtmlCell_GetFirstTerminal, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetLastTerminal", (PyCFunction) _wrap_HtmlCell_GetLastTerminal, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_GetDepth", (PyCFunction) _wrap_HtmlCell_GetDepth, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_IsBefore", (PyCFunction) _wrap_HtmlCell_IsBefore, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_ConvertToText", (PyCFunction) _wrap_HtmlCell_ConvertToText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlCell_swigregister", HtmlCell_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlWordCell", (PyCFunction) _wrap_new_HtmlWordCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWordCell_swigregister", HtmlWordCell_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlContainerCell", (PyCFunction) _wrap_new_HtmlContainerCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_InsertCell", (PyCFunction) _wrap_HtmlContainerCell_InsertCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_SetAlignHor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_GetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_GetAlignHor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_SetAlignVer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_GetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_GetAlignVer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetIndent", (PyCFunction) _wrap_HtmlContainerCell_SetIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_GetIndent", (PyCFunction) _wrap_HtmlContainerCell_GetIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_GetIndentUnits", (PyCFunction) _wrap_HtmlContainerCell_GetIndentUnits, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetAlign", (PyCFunction) _wrap_HtmlContainerCell_SetAlign, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetWidthFloat", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloat, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetWidthFloatFromTag", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloatFromTag, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetMinHeight", (PyCFunction) _wrap_HtmlContainerCell_SetMinHeight, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_GetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_SetBorder", (PyCFunction) _wrap_HtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_GetFirstChild", (PyCFunction) _wrap_HtmlContainerCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContainerCell_swigregister", HtmlContainerCell_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlColourCell", (PyCFunction) _wrap_new_HtmlColourCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlColourCell_swigregister", HtmlColourCell_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlFontCell", (PyCFunction) _wrap_new_HtmlFontCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlFontCell_swigregister", HtmlFontCell_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlWidgetCell", (PyCFunction) _wrap_new_HtmlWidgetCell, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWidgetCell_swigregister", HtmlWidgetCell_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlFilter", (PyCFunction) _wrap_new_HtmlFilter, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreHtmlWindow", (PyCFunction) _wrap_new_PreHtmlWindow, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow__setCallbackInfo", (PyCFunction) _wrap_HtmlWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SetPage", (PyCFunction) _wrap_HtmlWindow_SetPage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_LoadPage", (PyCFunction) _wrap_HtmlWindow_LoadPage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_LoadFile", (PyCFunction) _wrap_HtmlWindow_LoadFile, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_AppendToPage", (PyCFunction) _wrap_HtmlWindow_AppendToPage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_GetOpenedPage", (PyCFunction) _wrap_HtmlWindow_GetOpenedPage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_GetOpenedAnchor", (PyCFunction) _wrap_HtmlWindow_GetOpenedAnchor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_GetOpenedPageTitle", (PyCFunction) _wrap_HtmlWindow_GetOpenedPageTitle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_SetRelatedFrame, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_GetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_GetRelatedFrame, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SetRelatedStatusBar", (PyCFunction) _wrap_HtmlWindow_SetRelatedStatusBar, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SetFonts", (PyCFunction) _wrap_HtmlWindow_SetFonts, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SetTitle", (PyCFunction) _wrap_HtmlWindow_SetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SetBorders", (PyCFunction) _wrap_HtmlWindow_SetBorders, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_ReadCustomization", (PyCFunction) _wrap_HtmlWindow_ReadCustomization, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_WriteCustomization", (PyCFunction) _wrap_HtmlWindow_WriteCustomization, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_HistoryBack", (PyCFunction) _wrap_HtmlWindow_HistoryBack, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_HistoryForward", (PyCFunction) _wrap_HtmlWindow_HistoryForward, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_HistoryCanBack", (PyCFunction) _wrap_HtmlWindow_HistoryCanBack, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_HistoryCanForward", (PyCFunction) _wrap_HtmlWindow_HistoryCanForward, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_HistoryClear", (PyCFunction) _wrap_HtmlWindow_HistoryClear, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_GetInternalRepresentation", (PyCFunction) _wrap_HtmlWindow_GetInternalRepresentation, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_GetParser", (PyCFunction) _wrap_HtmlWindow_GetParser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_ScrollToAnchor", (PyCFunction) _wrap_HtmlWindow_ScrollToAnchor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_HasAnchor", (PyCFunction) _wrap_HtmlWindow_HasAnchor, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_AddFilter", (PyCFunction) _wrap_HtmlWindow_AddFilter, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_base_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_base_OnCellClicked, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlDCRenderer", (PyCFunction) _wrap_new_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_HtmlDCRenderer", (PyCFunction) _wrap_delete_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlDCRenderer_SetDC", (PyCFunction) _wrap_HtmlDCRenderer_SetDC, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlDCRenderer_SetSize", (PyCFunction) _wrap_HtmlDCRenderer_SetSize, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlDCRenderer_SetHtmlText", (PyCFunction) _wrap_HtmlDCRenderer_SetHtmlText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlDCRenderer_SetFonts", (PyCFunction) _wrap_HtmlDCRenderer_SetFonts, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlDCRenderer_Render", (PyCFunction) _wrap_HtmlDCRenderer_Render, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlDCRenderer_GetTotalHeight", (PyCFunction) _wrap_HtmlDCRenderer_GetTotalHeight, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlDCRenderer_swigregister", HtmlDCRenderer_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlPrintout", (PyCFunction) _wrap_new_HtmlPrintout, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_SetHtmlText", (PyCFunction) _wrap_HtmlPrintout_SetHtmlText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_SetHtmlFile", (PyCFunction) _wrap_HtmlPrintout_SetHtmlFile, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_SetHeader", (PyCFunction) _wrap_HtmlPrintout_SetHeader, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_SetFooter", (PyCFunction) _wrap_HtmlPrintout_SetFooter, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_SetFonts", (PyCFunction) _wrap_HtmlPrintout_SetFonts, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_SetMargins", (PyCFunction) _wrap_HtmlPrintout_SetMargins, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_AddFilter", (PyCFunction) _wrap_HtmlPrintout_AddFilter, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_CleanUpStatics", (PyCFunction) _wrap_HtmlPrintout_CleanUpStatics, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlPrintout_swigregister", HtmlPrintout_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlEasyPrinting", (PyCFunction) _wrap_new_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_HtmlEasyPrinting", (PyCFunction) _wrap_delete_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_PreviewFile", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewFile, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_PreviewText", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_PrintFile", (PyCFunction) _wrap_HtmlEasyPrinting_PrintFile, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_PrintText", (PyCFunction) _wrap_HtmlEasyPrinting_PrintText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_PrinterSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PrinterSetup, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_PageSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PageSetup, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_SetHeader", (PyCFunction) _wrap_HtmlEasyPrinting_SetHeader, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_SetFooter", (PyCFunction) _wrap_HtmlEasyPrinting_SetFooter, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_SetFonts", (PyCFunction) _wrap_HtmlEasyPrinting_SetFonts, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_GetPrintData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPrintData, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_GetPageSetupData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPageSetupData, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlEasyPrinting_swigregister", HtmlEasyPrinting_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlBookRecord", (PyCFunction) _wrap_new_HtmlBookRecord, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_GetBookFile", (PyCFunction) _wrap_HtmlBookRecord_GetBookFile, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_GetTitle", (PyCFunction) _wrap_HtmlBookRecord_GetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_GetStart", (PyCFunction) _wrap_HtmlBookRecord_GetStart, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_GetBasePath", (PyCFunction) _wrap_HtmlBookRecord_GetBasePath, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_SetContentsRange", (PyCFunction) _wrap_HtmlBookRecord_SetContentsRange, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_GetContentsStart", (PyCFunction) _wrap_HtmlBookRecord_GetContentsStart, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_GetContentsEnd", (PyCFunction) _wrap_HtmlBookRecord_GetContentsEnd, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_SetTitle", (PyCFunction) _wrap_HtmlBookRecord_SetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_SetBasePath", (PyCFunction) _wrap_HtmlBookRecord_SetBasePath, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_SetStart", (PyCFunction) _wrap_HtmlBookRecord_SetStart, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_GetFullPath", (PyCFunction) _wrap_HtmlBookRecord_GetFullPath, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlBookRecord_swigregister", HtmlBookRecord_swigregister, METH_VARARGS },
+	 { (char *)"HtmlContentsItem_GetLevel", (PyCFunction) _wrap_HtmlContentsItem_GetLevel, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContentsItem_GetID", (PyCFunction) _wrap_HtmlContentsItem_GetID, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContentsItem_GetName", (PyCFunction) _wrap_HtmlContentsItem_GetName, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContentsItem_GetPage", (PyCFunction) _wrap_HtmlContentsItem_GetPage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContentsItem_GetBook", (PyCFunction) _wrap_HtmlContentsItem_GetBook, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlContentsItem_swigregister", HtmlContentsItem_swigregister, METH_VARARGS },
+	 { (char *)"HtmlSearchStatus_Search", (PyCFunction) _wrap_HtmlSearchStatus_Search, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSearchStatus_IsActive", (PyCFunction) _wrap_HtmlSearchStatus_IsActive, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSearchStatus_GetCurIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetCurIndex, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSearchStatus_GetMaxIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetMaxIndex, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSearchStatus_GetName", (PyCFunction) _wrap_HtmlSearchStatus_GetName, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSearchStatus_GetContentsItem", (PyCFunction) _wrap_HtmlSearchStatus_GetContentsItem, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlSearchStatus_swigregister", HtmlSearchStatus_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlHelpData", (PyCFunction) _wrap_new_HtmlHelpData, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_HtmlHelpData", (PyCFunction) _wrap_delete_HtmlHelpData, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_SetTempDir", (PyCFunction) _wrap_HtmlHelpData_SetTempDir, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_AddBook", (PyCFunction) _wrap_HtmlHelpData_AddBook, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_FindPageByName", (PyCFunction) _wrap_HtmlHelpData_FindPageByName, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_FindPageById", (PyCFunction) _wrap_HtmlHelpData_FindPageById, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_GetBookRecArray", (PyCFunction) _wrap_HtmlHelpData_GetBookRecArray, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_GetContents", (PyCFunction) _wrap_HtmlHelpData_GetContents, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_GetContentsCnt", (PyCFunction) _wrap_HtmlHelpData_GetContentsCnt, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_GetIndex", (PyCFunction) _wrap_HtmlHelpData_GetIndex, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_GetIndexCnt", (PyCFunction) _wrap_HtmlHelpData_GetIndexCnt, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpData_swigregister", HtmlHelpData_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_GetData", (PyCFunction) _wrap_HtmlHelpFrame_GetData, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpFrame_SetTitleFormat, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_Display", (PyCFunction) _wrap_HtmlHelpFrame_Display, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_DisplayID", (PyCFunction) _wrap_HtmlHelpFrame_DisplayID, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_DisplayContents", (PyCFunction) _wrap_HtmlHelpFrame_DisplayContents, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_DisplayIndex", (PyCFunction) _wrap_HtmlHelpFrame_DisplayIndex, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_KeywordSearch", (PyCFunction) _wrap_HtmlHelpFrame_KeywordSearch, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_UseConfig", (PyCFunction) _wrap_HtmlHelpFrame_UseConfig, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_ReadCustomization", (PyCFunction) _wrap_HtmlHelpFrame_ReadCustomization, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_WriteCustomization", (PyCFunction) _wrap_HtmlHelpFrame_WriteCustomization, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpFrame_swigregister", HtmlHelpFrame_swigregister, METH_VARARGS },
+	 { (char *)"new_HtmlHelpController", (PyCFunction) _wrap_new_HtmlHelpController, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_HtmlHelpController", (PyCFunction) _wrap_delete_HtmlHelpController, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpController_SetTitleFormat, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_SetTempDir", (PyCFunction) _wrap_HtmlHelpController_SetTempDir, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_AddBook", (PyCFunction) _wrap_HtmlHelpController_AddBook, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_Display", (PyCFunction) _wrap_HtmlHelpController_Display, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_DisplayID", (PyCFunction) _wrap_HtmlHelpController_DisplayID, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_DisplayContents", (PyCFunction) _wrap_HtmlHelpController_DisplayContents, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_DisplayIndex", (PyCFunction) _wrap_HtmlHelpController_DisplayIndex, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_KeywordSearch", (PyCFunction) _wrap_HtmlHelpController_KeywordSearch, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_UseConfig", (PyCFunction) _wrap_HtmlHelpController_UseConfig, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_ReadCustomization", (PyCFunction) _wrap_HtmlHelpController_ReadCustomization, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_WriteCustomization", (PyCFunction) _wrap_HtmlHelpController_WriteCustomization, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_GetFrame", (PyCFunction) _wrap_HtmlHelpController_GetFrame, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"HtmlHelpController_swigregister", HtmlHelpController_swigregister, METH_VARARGS },
+	 { NULL, NULL }
 };
 
 
@@ -10748,6 +10873,9 @@ static void *_p_wxScrolledWindowTo_p_wxPanel(void *x) {
 static void *_p_wxPyVScrolledWindowTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *)  ((wxPyVScrolledWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxPanel(void *x) {
+    return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPyHtmlWindowTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyHtmlWindow *) x));
 }
@@ -10769,6 +10897,9 @@ static void *_p_wxPreviewControlBarTo_p_wxPanel(void *x) {
 static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxPreviewControlBar *) ((wxPyPreviewControlBar *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxScrolledWindow(void *x) {
+    return (void *)((wxScrolledWindow *)  ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPyHtmlWindowTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPyHtmlWindow *) x));
 }
@@ -10847,6 +10978,9 @@ static void *_p_wxSplitterWindowTo_p_wxWindow(void *x) {
 static void *_p_wxSashWindowTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxSashWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPyHtmlWindowTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyHtmlWindow *) x));
 }
@@ -11321,6 +11455,9 @@ static void *_p_wxPyVScrolledWindowTo_p_wxObject(void *x) {
 static void *_p_wxMDIClientWindowTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMDIClientWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPyHtmlWindowTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyHtmlWindow *) x));
 }
@@ -11513,6 +11650,9 @@ static void *_p_wxTopLevelWindowTo_p_wxEvtHandler(void *x) {
 static void *_p_wxMDIClientWindowTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *) ((wxMDIClientWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPyHtmlWindowTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyHtmlWindow *) x));
 }
@@ -11638,28 +11778,29 @@ static swig_type_info _swigt__p_wxDefaultHtmlRenderingStyle[] = {{"_p_wxDefaultH
 static swig_type_info _swigt__p_wxHtmlRenderingStyle[] = {{"_p_wxHtmlRenderingStyle", 0, "wxHtmlRenderingStyle *", 0, 0, 0, 0},{"_p_wxHtmlRenderingStyle", 0, 0, 0, 0, 0, 0},{"_p_wxDefaultHtmlRenderingStyle", _p_wxDefaultHtmlRenderingStyleTo_p_wxHtmlRenderingStyle, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0, 0, 0, 0},{"_p_wxMouseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlWordCell[] = {{"_p_wxHtmlWordCell", 0, "wxHtmlWordCell *", 0, 0, 0, 0},{"_p_wxHtmlWordCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxVisualAttributes[] = {{"_p_wxVisualAttributes", 0, "wxVisualAttributes *", 0, 0, 0, 0},{"_p_wxVisualAttributes", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlHelpData[] = {{"_p_wxHtmlHelpData", 0, "wxHtmlHelpData *", 0, 0, 0, 0},{"_p_wxHtmlHelpData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlWinParser[] = {{"_p_wxHtmlWinParser", 0, "wxHtmlWinParser *", 0, 0, 0, 0},{"_p_wxHtmlWinParser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlParser[] = {{"_p_wxHtmlParser", 0, "wxHtmlParser *", 0, 0, 0, 0},{"_p_wxHtmlParser", 0, 0, 0, 0, 0, 0},{"_p_wxHtmlWinParser", _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlColourCell[] = {{"_p_wxHtmlColourCell", 0, "wxHtmlColourCell *", 0, 0, 0, 0},{"_p_wxHtmlColourCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyHtmlWindow[] = {{"_p_wxPyHtmlWindow", 0, "wxPyHtmlWindow *", 0, 0, 0, 0},{"_p_wxPyHtmlWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, "wxTopLevelWindow *", 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", 0, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlFontCell[] = {{"_p_wxHtmlFontCell", 0, "wxHtmlFontCell *", 0, 0, 0, 0},{"_p_wxHtmlFontCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlEasyPrinting[] = {{"_p_wxHtmlEasyPrinting", 0, "wxHtmlEasyPrinting *", 0, 0, 0, 0},{"_p_wxHtmlEasyPrinting", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlSelection[] = {{"_p_wxHtmlSelection", 0, "wxHtmlSelection *", 0, 0, 0, 0},{"_p_wxHtmlSelection", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlRenderingInfo[] = {{"_p_wxHtmlRenderingInfo", 0, "wxHtmlRenderingInfo *", 0, 0, 0, 0},{"_p_wxHtmlRenderingInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlWidgetCell[] = {{"_p_wxHtmlWidgetCell", 0, "wxHtmlWidgetCell *", 0, 0, 0, 0},{"_p_wxHtmlWidgetCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlLinkInfo", _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlFontCell", _p_wxHtmlFontCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlTag", _p_wxHtmlTagTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlCell", _p_wxHtmlCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlWidgetCell", _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlColourCell", _p_wxHtmlColourCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlFilter", _p_wxPyHtmlFilterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlTagHandler", _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWinTagHandler", _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlPrintout", _p_wxHtmlPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlDCRenderer", _p_wxHtmlDCRendererTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlContainerCell", _p_wxHtmlContainerCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlParser", _p_wxHtmlParserTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlWinParser", _p_wxHtmlWinParserTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlWordCell", _p_wxHtmlWordCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlEasyPrinting", _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpController", _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlLinkInfo", _p_wxHtmlLinkInfoTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlFontCell", _p_wxHtmlFontCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlTag", _p_wxHtmlTagTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlCell", _p_wxHtmlCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlWidgetCell", _p_wxHtmlWidgetCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlColourCell", _p_wxHtmlColourCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlFilter", _p_wxPyHtmlFilterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlTagHandler", _p_wxPyHtmlTagHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWinTagHandler", _p_wxPyHtmlWinTagHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlPrintout", _p_wxHtmlPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlDCRenderer", _p_wxHtmlDCRendererTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlContainerCell", _p_wxHtmlContainerCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlParser", _p_wxHtmlParserTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlWinParser", _p_wxHtmlWinParserTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlWordCell", _p_wxHtmlWordCellTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlEasyPrinting", _p_wxHtmlEasyPrintingTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpController", _p_wxHtmlHelpControllerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyHtmlWinTagHandler[] = {{"_p_wxPyHtmlWinTagHandler", 0, "wxPyHtmlWinTagHandler *", 0, 0, 0, 0},{"_p_wxPyHtmlWinTagHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlTagHandler[] = {{"_p_wxHtmlTagHandler", 0, "wxHtmlTagHandler *", 0, 0, 0, 0},{"_p_wxHtmlTagHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyHtmlTagHandler[] = {{"_p_wxPyHtmlTagHandler", 0, "wxPyHtmlTagHandler *", 0, 0, 0, 0},{"_p_wxPyHtmlTagHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWinTagHandler", _p_wxPyHtmlWinTagHandlerTo_p_wxPyHtmlTagHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpController", _p_wxHtmlHelpControllerTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpController", _p_wxHtmlHelpControllerTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlHelpController[] = {{"_p_wxHtmlHelpController", 0, "wxHtmlHelpController *", 0, 0, 0, 0},{"_p_wxHtmlHelpController", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0, 0, 0, 0},{"_p_wxCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -11692,6 +11833,7 @@ _swigt__p_wxDefaultHtmlRenderingStyle,
 _swigt__p_wxHtmlRenderingStyle, 
 _swigt__p_wxMouseEvent, 
 _swigt__p_wxHtmlWordCell, 
+_swigt__p_wxVisualAttributes, 
 _swigt__p_wxHtmlHelpData, 
 _swigt__p_char, 
 _swigt__p_wxHtmlWinParser, 
@@ -11743,7 +11885,7 @@ _swigt__p_wxHtmlBookRecord,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0, 0, 0, 0.0, 0, 0}};
+{0}};
 
 #ifdef __cplusplus
 }