X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e811c8cebb5c274e50971a6a8ee66fb3ab053eb9..ff9ca1fd6fe7484adf7361b0e64df8cc34f8b842:/wxPython/src/gtk/html_wrap.cpp

diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp
index c1811c248e..ad01de3dec 100644
--- a/wxPython/src/gtk/html_wrap.cpp
+++ b/wxPython/src/gtk/html_wrap.cpp
@@ -97,10 +97,10 @@ typedef void *(*swig_converter_func)(void *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
 typedef struct swig_type_info {
-  const char             *name;
+  const char             *name;                 
   swig_converter_func     converter;
   const char             *str;
-  void                   *clientdata;
+  void                   *clientdata;	
   swig_dycast_func        dcast;
   struct swig_type_info  *next;
   struct swig_type_info  *prev;
@@ -118,6 +118,7 @@ SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
 
 #ifdef __cplusplus
 }
+
 #endif
 
 /***********************************************************************
@@ -203,15 +204,8 @@ SWIGEXPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 
 /* Contract support */
 
-#define SWIG_preassert(expr, msg)  if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-
-#define SWIG_inherit_preassert(expr, msg)  if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
+#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
 
-#define SWIG_invariant(expr, msg)       if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
-#define SWIG_invariant_end(expr, msg)   if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else
 
 #ifdef __cplusplus
 }
@@ -378,15 +372,17 @@ public:
 
         // First, make a new instance of the tag handler
         wxPyBeginBlockThreads();
-        PyObject* arg = Py_BuildValue("()");
-        PyObject* obj = PyInstance_New(m_tagHandlerClass, arg, NULL);
+        PyObject* arg = PyTuple_New(0);
+        PyObject* obj = PyObject_CallObject(m_tagHandlerClass, arg);
         Py_DECREF(arg);
-        wxPyEndBlockThreads();
-
+        
         // now figure out where it's C++ object is...
         wxPyHtmlWinTagHandler* thPtr;
-        if (! wxPyConvertSwigPtr(obj, (void **)&thPtr, wxT("wxPyHtmlWinTagHandler")))
+        if (! wxPyConvertSwigPtr(obj, (void **)&thPtr, wxT("wxPyHtmlWinTagHandler"))) {
+            wxPyEndBlockThreads();
             return;
+        }
+        wxPyEndBlockThreads();
 
         // add it,
         parser->AddTagHandler(thPtr);
@@ -10668,6 +10664,13 @@ static swig_const_info swig_const_table[] = {
 { SWIG_PY_INT,     (char *)"HTML_COND_ISANCHOR", (long) wxHTML_COND_ISANCHOR, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HTML_COND_ISIMAGEMAP", (long) wxHTML_COND_ISIMAGEMAP, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HTML_COND_USER", (long) wxHTML_COND_USER, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_1", (long) wxHTML_FONT_SIZE_1, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_2", (long) wxHTML_FONT_SIZE_2, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_3", (long) wxHTML_FONT_SIZE_3, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_4", (long) wxHTML_FONT_SIZE_4, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_5", (long) wxHTML_FONT_SIZE_5, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_6", (long) wxHTML_FONT_SIZE_6, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_7", (long) wxHTML_FONT_SIZE_7, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HW_SCROLLBAR_NEVER", (long) wxHW_SCROLLBAR_NEVER, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HW_SCROLLBAR_AUTO", (long) wxHW_SCROLLBAR_AUTO, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HW_NO_SELECTION", (long) wxHW_NO_SELECTION, 0, 0, 0},