From 95eb036e7bc151c7fb960eaf34762c56569c3245 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 14 Apr 2005 01:12:37 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/mac/_core_wrap.cpp | 12 ++++-- wxPython/src/mac/webkit.py | 8 ++++ wxPython/src/mac/webkit_wrap.cpp | 68 ++++++++++++++++++++++++++++++++ wxPython/src/msw/webkit.py | 8 ++++ wxPython/src/msw/webkit_wrap.cpp | 68 ++++++++++++++++++++++++++++++++ 5 files changed, 161 insertions(+), 3 deletions(-) diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 9e06d29628..bc374b41f3 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -22676,21 +22676,27 @@ static PyObject *_wrap_PyApp__setCallbackInfo(PyObject *, PyObject *args, PyObje wxPyApp *arg1 = (wxPyApp *) 0 ; PyObject *arg2 = (PyObject *) 0 ; PyObject *arg3 = (PyObject *) 0 ; + bool arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "self",(char *) "_class", NULL + (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; arg2 = obj1; arg3 = obj2; + { + arg4 = (bool)(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->_setCallbackInfo(arg2,arg3); + (arg1)->_setCallbackInfo(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/mac/webkit.py b/wxPython/src/mac/webkit.py index 5beb522fec..fb14f84a4b 100644 --- a/wxPython/src/mac/webkit.py +++ b/wxPython/src/mac/webkit.py @@ -117,6 +117,14 @@ class WebKitCtrl(_core.Control): """SetPageSource(self, String source, String baseUrl=EmptyString)""" return _webkit.WebKitCtrl_SetPageSource(*args, **kwargs) + def GetPageURL(*args, **kwargs): + """GetPageURL(self) -> String""" + return _webkit.WebKitCtrl_GetPageURL(*args, **kwargs) + + def GetPageTitle(*args, **kwargs): + """GetPageTitle(self) -> String""" + return _webkit.WebKitCtrl_GetPageTitle(*args, **kwargs) + class WebKitCtrlPtr(WebKitCtrl): def __init__(self, this): diff --git a/wxPython/src/mac/webkit_wrap.cpp b/wxPython/src/mac/webkit_wrap.cpp index 3724882465..6927b2f5f2 100644 --- a/wxPython/src/mac/webkit_wrap.cpp +++ b/wxPython/src/mac/webkit_wrap.cpp @@ -1422,6 +1422,8 @@ public: bool CanGetPageSource() { return false; } wxString GetPageSource() { return wxEmptyString; } void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString) {} + wxString GetPageURL() { return wxEmptyString; } + wxString GetPageTitle() { return wxEmptyString; } }; @@ -2170,6 +2172,70 @@ static PyObject *_wrap_WebKitCtrl_SetPageSource(PyObject *, PyObject *args, PyOb } +static PyObject *_wrap_WebKitCtrl_GetPageURL(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWebKitCtrl *arg1 = (wxWebKitCtrl *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WebKitCtrl_GetPageURL",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWebKitCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetPageURL(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_WebKitCtrl_GetPageTitle(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWebKitCtrl *arg1 = (wxWebKitCtrl *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WebKitCtrl_GetPageTitle",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWebKitCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetPageTitle(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + static PyObject * WebKitCtrl_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -2358,6 +2424,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"WebKitCtrl_CanGetPageSource", (PyCFunction) _wrap_WebKitCtrl_CanGetPageSource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitCtrl_GetPageSource", (PyCFunction) _wrap_WebKitCtrl_GetPageSource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitCtrl_SetPageSource", (PyCFunction) _wrap_WebKitCtrl_SetPageSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"WebKitCtrl_GetPageURL", (PyCFunction) _wrap_WebKitCtrl_GetPageURL, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"WebKitCtrl_GetPageTitle", (PyCFunction) _wrap_WebKitCtrl_GetPageTitle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitCtrl_swigregister", WebKitCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"new_WebKitStateChangedEvent", (PyCFunction) _wrap_new_WebKitStateChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitStateChangedEvent_GetState", (PyCFunction) _wrap_WebKitStateChangedEvent_GetState, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/webkit.py b/wxPython/src/msw/webkit.py index 5beb522fec..fb14f84a4b 100644 --- a/wxPython/src/msw/webkit.py +++ b/wxPython/src/msw/webkit.py @@ -117,6 +117,14 @@ class WebKitCtrl(_core.Control): """SetPageSource(self, String source, String baseUrl=EmptyString)""" return _webkit.WebKitCtrl_SetPageSource(*args, **kwargs) + def GetPageURL(*args, **kwargs): + """GetPageURL(self) -> String""" + return _webkit.WebKitCtrl_GetPageURL(*args, **kwargs) + + def GetPageTitle(*args, **kwargs): + """GetPageTitle(self) -> String""" + return _webkit.WebKitCtrl_GetPageTitle(*args, **kwargs) + class WebKitCtrlPtr(WebKitCtrl): def __init__(self, this): diff --git a/wxPython/src/msw/webkit_wrap.cpp b/wxPython/src/msw/webkit_wrap.cpp index daa24cd097..c8d8d0c061 100644 --- a/wxPython/src/msw/webkit_wrap.cpp +++ b/wxPython/src/msw/webkit_wrap.cpp @@ -1422,6 +1422,8 @@ public: bool CanGetPageSource() { return false; } wxString GetPageSource() { return wxEmptyString; } void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString) {} + wxString GetPageURL() { return wxEmptyString; } + wxString GetPageTitle() { return wxEmptyString; } }; @@ -2170,6 +2172,70 @@ static PyObject *_wrap_WebKitCtrl_SetPageSource(PyObject *, PyObject *args, PyOb } +static PyObject *_wrap_WebKitCtrl_GetPageURL(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWebKitCtrl *arg1 = (wxWebKitCtrl *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WebKitCtrl_GetPageURL",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWebKitCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetPageURL(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_WebKitCtrl_GetPageTitle(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWebKitCtrl *arg1 = (wxWebKitCtrl *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:WebKitCtrl_GetPageTitle",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWebKitCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetPageTitle(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + static PyObject * WebKitCtrl_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -2358,6 +2424,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"WebKitCtrl_CanGetPageSource", (PyCFunction) _wrap_WebKitCtrl_CanGetPageSource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitCtrl_GetPageSource", (PyCFunction) _wrap_WebKitCtrl_GetPageSource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitCtrl_SetPageSource", (PyCFunction) _wrap_WebKitCtrl_SetPageSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"WebKitCtrl_GetPageURL", (PyCFunction) _wrap_WebKitCtrl_GetPageURL, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"WebKitCtrl_GetPageTitle", (PyCFunction) _wrap_WebKitCtrl_GetPageTitle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitCtrl_swigregister", WebKitCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"new_WebKitStateChangedEvent", (PyCFunction) _wrap_new_WebKitStateChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WebKitStateChangedEvent_GetState", (PyCFunction) _wrap_WebKitStateChangedEvent_GetState, METH_VARARGS | METH_KEYWORDS, NULL}, -- 2.47.2