X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e70b4d2db930a297f0625b7d43109f793fd3338a..d576c660f7b6679d74ffef8a6f3d46b901bd37ee:/wxPython/src/mac/webkit.py

diff --git a/wxPython/src/mac/webkit.py b/wxPython/src/mac/webkit.py
index 4d57edce2c..8b548ea5f0 100644
--- a/wxPython/src/mac/webkit.py
+++ b/wxPython/src/mac/webkit.py
@@ -129,9 +129,55 @@ class WebKitCtrl(_core.Control):
         """GetPageTitle(self) -> String"""
         return _webkit.WebKitCtrl_GetPageTitle(*args, **kwargs)
 
+    def GetSelection(*args, **kwargs):
+        """GetSelection(self) -> String"""
+        return _webkit.WebKitCtrl_GetSelection(*args, **kwargs)
+
+    def CanIncreaseTextSize(*args, **kwargs):
+        """CanIncreaseTextSize(self) -> bool"""
+        return _webkit.WebKitCtrl_CanIncreaseTextSize(*args, **kwargs)
+
+    def IncreaseTextSize(*args, **kwargs):
+        """IncreaseTextSize(self)"""
+        return _webkit.WebKitCtrl_IncreaseTextSize(*args, **kwargs)
+
+    def CanDecreaseTextSize(*args, **kwargs):
+        """CanDecreaseTextSize(self) -> bool"""
+        return _webkit.WebKitCtrl_CanDecreaseTextSize(*args, **kwargs)
+
+    def DecreaseTextSize(*args, **kwargs):
+        """DecreaseTextSize(self)"""
+        return _webkit.WebKitCtrl_DecreaseTextSize(*args, **kwargs)
+
+    def Print(*args, **kwargs):
+        """Print(self, bool showPrompt=False)"""
+        return _webkit.WebKitCtrl_Print(*args, **kwargs)
+
+    def MakeEditable(*args, **kwargs):
+        """MakeEditable(self, bool enable=True)"""
+        return _webkit.WebKitCtrl_MakeEditable(*args, **kwargs)
+
+    def IsEditable(*args, **kwargs):
+        """IsEditable(self) -> bool"""
+        return _webkit.WebKitCtrl_IsEditable(*args, **kwargs)
+
+    def RunScript(*args, **kwargs):
+        """RunScript(self, String javascript) -> String"""
+        return _webkit.WebKitCtrl_RunScript(*args, **kwargs)
+
+    def SetScrollPos(*args, **kwargs):
+        """SetScrollPos(self, int pos)"""
+        return _webkit.WebKitCtrl_SetScrollPos(*args, **kwargs)
+
+    def GetScrollPos(*args, **kwargs):
+        """GetScrollPos(self) -> int"""
+        return _webkit.WebKitCtrl_GetScrollPos(*args, **kwargs)
+
     PageSource = property(GetPageSource,SetPageSource,doc="See `GetPageSource` and `SetPageSource`") 
     PageTitle = property(GetPageTitle,doc="See `GetPageTitle`") 
     PageURL = property(GetPageURL,doc="See `GetPageURL`") 
+    ScrollPos = property(GetScrollPos,SetScrollPos,doc="See `GetScrollPos and SetScrollPos`") 
+    Selection = property(GetSelection,doc="See `GetSelection`") 
 _webkit.WebKitCtrl_swigregister(WebKitCtrl)
 cvar = _webkit.cvar
 WebKitNameStr = cvar.WebKitNameStr
@@ -147,7 +193,49 @@ WEBKIT_STATE_REDIRECTING = _webkit.WEBKIT_STATE_REDIRECTING
 WEBKIT_STATE_TRANSFERRING = _webkit.WEBKIT_STATE_TRANSFERRING
 WEBKIT_STATE_STOP = _webkit.WEBKIT_STATE_STOP
 WEBKIT_STATE_FAILED = _webkit.WEBKIT_STATE_FAILED
+WEBKIT_NAV_LINK_CLICKED = _webkit.WEBKIT_NAV_LINK_CLICKED
+WEBKIT_NAV_BACK_NEXT = _webkit.WEBKIT_NAV_BACK_NEXT
+WEBKIT_NAV_FORM_SUBMITTED = _webkit.WEBKIT_NAV_FORM_SUBMITTED
+WEBKIT_NAV_RELOAD = _webkit.WEBKIT_NAV_RELOAD
+WEBKIT_NAV_FORM_RESUBMITTED = _webkit.WEBKIT_NAV_FORM_RESUBMITTED
+WEBKIT_NAV_OTHER = _webkit.WEBKIT_NAV_OTHER
 wxEVT_WEBKIT_STATE_CHANGED = _webkit.wxEVT_WEBKIT_STATE_CHANGED
+wxEVT_WEBKIT_BEFORE_LOAD = _webkit.wxEVT_WEBKIT_BEFORE_LOAD
+class WebKitBeforeLoadEvent(_core.CommandEvent):
+    """Proxy of C++ WebKitBeforeLoadEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def IsCancelled(*args, **kwargs):
+        """IsCancelled(self) -> bool"""
+        return _webkit.WebKitBeforeLoadEvent_IsCancelled(*args, **kwargs)
+
+    def Cancel(*args, **kwargs):
+        """Cancel(self, bool cancel=True)"""
+        return _webkit.WebKitBeforeLoadEvent_Cancel(*args, **kwargs)
+
+    def GetURL(*args, **kwargs):
+        """GetURL(self) -> String"""
+        return _webkit.WebKitBeforeLoadEvent_GetURL(*args, **kwargs)
+
+    def SetURL(*args, **kwargs):
+        """SetURL(self, String url)"""
+        return _webkit.WebKitBeforeLoadEvent_SetURL(*args, **kwargs)
+
+    def SetNavigationType(*args, **kwargs):
+        """SetNavigationType(self, int navType)"""
+        return _webkit.WebKitBeforeLoadEvent_SetNavigationType(*args, **kwargs)
+
+    def GetNavigationType(*args, **kwargs):
+        """GetNavigationType(self) -> int"""
+        return _webkit.WebKitBeforeLoadEvent_GetNavigationType(*args, **kwargs)
+
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, Window win=(wxWindow *) NULL) -> WebKitBeforeLoadEvent"""
+        _webkit.WebKitBeforeLoadEvent_swiginit(self,_webkit.new_WebKitBeforeLoadEvent(*args, **kwargs))
+    NavigationType = property(GetNavigationType,SetNavigationType,doc="See `GetNavigationType` and `SetNavigationType`") 
+    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
+_webkit.WebKitBeforeLoadEvent_swigregister(WebKitBeforeLoadEvent)
+
 class WebKitStateChangedEvent(_core.CommandEvent):
     """Proxy of C++ WebKitStateChangedEvent class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -176,6 +264,7 @@ class WebKitStateChangedEvent(_core.CommandEvent):
 _webkit.WebKitStateChangedEvent_swigregister(WebKitStateChangedEvent)
 
 EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED)
+EVT_WEBKIT_BEFORE_LOAD = wx.PyEventBinder(wxEVT_WEBKIT_BEFORE_LOAD)