WinCE patches from "Viktor Voroshylo" <viktor@voroshylo.com>

[wxWidgets.git] / wxPython / src / msw / html_wrap.cpp

diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp
index cb1c29b653e060a6f9b69aa038dbe327879c848f..78f5953e24ad76a2ef96c6e9f6c44f5ce3f8d1a2 100644 (file)
--- a/wxPython/src/msw/html_wrap.cpp
+++ b/wxPython/src/msw/html_wrap.cpp
@@ -372,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);
@@ -10184,9 +10186,6 @@ static void *_p_wxNavigationKeyEventTo_p_wxObject(void *x) {
 static void *_p_wxKeyEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxKeyEvent *) x));
 }
-static void *_p_wxScrolledWindowTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x));
-}
 static void *_p_wxWindowTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxWindow *) x));
 }
@@ -10196,6 +10195,9 @@ static void *_p_wxMenuTo_p_wxObject(void *x) {
 static void *_p_wxMenuBarTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
 }
+static void *_p_wxScrolledWindowTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x));
+}
 static void *_p_wxTopLevelWindowTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxTopLevelWindow *) x));
 }
@@ -10662,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},