SWIGged update for wxGTK (the last checkin was really for wxMSW...)

[wxWidgets.git] / wxPython / src / mac / html.cpp

diff --git a/wxPython/src/mac/html.cpp b/wxPython/src/mac/html.cpp
index f50735be2481eaba25bf40745f8b50eaf2d2beed..5925043ded7c25d6d06c763c28ada9c4dc422410 100644 (file)
--- a/wxPython/src/mac/html.cpp
+++ b/wxPython/src/mac/html.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "htmlc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/html/htmlwin.h>
 #include <wx/html/htmprint.h>
 #include <wx/image.h>
@@ -264,7 +264,9 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
     wxPyBeginBlockThreads();
     if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) {
         PyObject* ro;
-        ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iO)", type, wx2PyString(url)));
+        PyObject* s = wx2PyString(url);
+        ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iO)", type, s));
+        Py_DECREF(s);
         if (PyString_Check(ro)
 #if PYTHON_API_VERSION >= 1009
             || PyUnicode_Check(ro)
@@ -4066,7 +4068,7 @@ static PyObject *_wrap_new_wxHtmlWindow(PyObject *self, PyObject *args, PyObject
     wxSize  temp0;
     PyObject * _obj3 = 0;
     PyObject * _obj5 = 0;
-    char *_kwnames[] = { "parent","id","pos","size","flags","name", NULL };
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
@@ -4161,7 +4163,7 @@ static PyObject *_wrap_wxHtmlWindow_Create(PyObject *self, PyObject *args, PyObj
     wxSize  temp0;
     PyObject * _obj4 = 0;
     PyObject * _obj6 = 0;
-    char *_kwnames[] = { "self","parent","id","pos","size","flags","name", NULL };
+    char *_kwnames[] = { "self","parent","id","pos","size","style","name", NULL };
 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOOiO:wxHtmlWindow_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6))