X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e70b4d2db930a297f0625b7d43109f793fd3338a..5172800e29f9c4b3f4dfa9737f80114a61e55f1f:/wxPython/src/mac/html.py

diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py
index a904a6f95a..f237461920 100644
--- a/wxPython/src/mac/html.py
+++ b/wxPython/src/mac/html.py
@@ -1630,7 +1630,7 @@ class HtmlHelpWindow(_core.Window):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):
-        """GetHtmlWindow(self) -> wxHtmlWindow"""
+        """GetHtmlWindow(self) -> HtmlWindow"""
         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):
@@ -1664,23 +1664,57 @@ def PreHtmlHelpWindow(*args, **kwargs):
     self._setOORInfo(self)
     return val
 
-class HtmlWindowEvent(_core.NotifyEvent):
-    """Proxy of C++ HtmlWindowEvent class"""
+wxEVT_COMMAND_HTML_CELL_CLICKED = _html.wxEVT_COMMAND_HTML_CELL_CLICKED
+wxEVT_COMMAND_HTML_CELL_HOVER = _html.wxEVT_COMMAND_HTML_CELL_HOVER
+wxEVT_COMMAND_HTML_LINK_CLICKED = _html.wxEVT_COMMAND_HTML_LINK_CLICKED
+class HtmlCellEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlCellEvent class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
-        """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
-        _html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
-    def SetURL(*args, **kwargs):
-        """SetURL(self, String url)"""
-        return _html.HtmlWindowEvent_SetURL(*args, **kwargs)
+        """
+        __init__(self, EventType commandType, int id, HtmlCell cell, Point pt, 
+            MouseEvent ev) -> HtmlCellEvent
+        """
+        _html.HtmlCellEvent_swiginit(self,_html.new_HtmlCellEvent(*args, **kwargs))
+    def GetCell(*args, **kwargs):
+        """GetCell(self) -> HtmlCell"""
+        return _html.HtmlCellEvent_GetCell(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint(self) -> Point"""
+        return _html.HtmlCellEvent_GetPoint(*args, **kwargs)
+
+    def GetMouseEvent(*args, **kwargs):
+        """GetMouseEvent(self) -> MouseEvent"""
+        return _html.HtmlCellEvent_GetMouseEvent(*args, **kwargs)
+
+    def SetLinkClicked(*args, **kwargs):
+        """SetLinkClicked(self, bool linkclicked)"""
+        return _html.HtmlCellEvent_SetLinkClicked(*args, **kwargs)
+
+    def GetLinkClicked(*args, **kwargs):
+        """GetLinkClicked(self) -> bool"""
+        return _html.HtmlCellEvent_GetLinkClicked(*args, **kwargs)
+
+_html.HtmlCellEvent_swigregister(HtmlCellEvent)
 
-    def GetURL(*args, **kwargs):
-        """GetURL(self) -> String"""
-        return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
+class HtmlLinkEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlLinkEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, int id, HtmlLinkInfo linkinfo) -> HtmlLinkEvent"""
+        _html.HtmlLinkEvent_swiginit(self,_html.new_HtmlLinkEvent(*args, **kwargs))
+    def GetLinkInfo(*args, **kwargs):
+        """GetLinkInfo(self) -> HtmlLinkInfo"""
+        return _html.HtmlLinkEvent_GetLinkInfo(*args, **kwargs)
+
+_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)
 
-    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
-_html.HtmlWindowEvent_swigregister(HtmlWindowEvent)
+EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
+EVT_HTML_CELL_HOVER   = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
+EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )
 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""
@@ -1689,13 +1723,18 @@ class HtmlHelpFrame(_windows.Frame):
     def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int ?, String title=EmptyString, int style=wxHF_DEFAULTSTYLE, 
-            HtmlHelpData data=None) -> HtmlHelpFrame
+            HtmlHelpData data=None, 
+            ConfigBase config=None, String rootpath=EmptyString) -> HtmlHelpFrame
         """
         _html.HtmlHelpFrame_swiginit(self,_html.new_HtmlHelpFrame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
-        """Create(self, Window parent, int id, String title=EmptyString, int style=HF_DEFAULT_STYLE) -> bool"""
+        """
+        Create(self, Window parent, int id, String title=EmptyString, int style=HF_DEFAULT_STYLE, 
+            ConfigBase config=None, 
+            String rootpath=EmptyString) -> bool
+        """
         return _html.HtmlHelpFrame_Create(*args, **kwargs)
 
     def GetData(*args, **kwargs):