wx.VScrolledWindow has been refactored, and new wx.HScrolledWindow and

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

diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py
index 4af11a0939e9047a313108a04030689dfdc76b42..a02bcdbafc9440d8897ff4f0dc4b400667a2b044 100644 (file)
--- a/wxPython/src/mac/html.py
+++ b/wxPython/src/mac/html.py
@@ -255,11 +255,6 @@ class HtmlWinParser(HtmlParser):
         """GetCharWidth(self) -> int"""
         return _html.HtmlWinParser_GetCharWidth(*args, **kwargs)
 
-    def GetWindow(*args, **kwargs):
-        """GetWindow(self) -> HtmlWindow"""
-        return _html.HtmlWinParser_GetWindow(*args, **kwargs)
-
-    GetWindow = wx._deprecated(GetWindow) 
     def GetWindowInterface(*args, **kwargs):
         """GetWindowInterface(self) -> HtmlWindowInterface"""
         return _html.HtmlWinParser_GetWindowInterface(*args, **kwargs)
@@ -391,7 +386,7 @@ class HtmlTagHandler(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlTagHandler"""
         _html.HtmlTagHandler_swiginit(self,_html.new_HtmlTagHandler(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlTagHandler)
+        HtmlTagHandler._setCallbackInfo(self, self, HtmlTagHandler)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -419,7 +414,7 @@ class HtmlWinTagHandler(HtmlTagHandler):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlWinTagHandler"""
         _html.HtmlWinTagHandler_swiginit(self,_html.new_HtmlWinTagHandler(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlWinTagHandler)
+        HtmlWinTagHandler._setCallbackInfo(self, self, HtmlWinTagHandler)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -676,11 +671,6 @@ class HtmlCell(_core.Object):
         """GetMouseCursor(self, HtmlWindowInterface window) -> Cursor"""
         return _html.HtmlCell_GetMouseCursor(*args, **kwargs)
 
-    def GetCursor(*args, **kwargs):
-        """GetCursor(self) -> Cursor"""
-        return _html.HtmlCell_GetCursor(*args, **kwargs)
-
-    GetCursor = wx._deprecated(GetCursor) 
     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
@@ -765,7 +755,6 @@ class HtmlCell(_core.Object):
         """ConvertToText(self, HtmlSelection sel) -> String"""
         return _html.HtmlCell_ConvertToText(*args, **kwargs)
 
-    Cursor = property(GetCursor,doc="See `GetCursor`") 
     Depth = property(GetDepth,doc="See `GetDepth`") 
     Descent = property(GetDescent,doc="See `GetDescent`") 
     FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") 
@@ -920,7 +909,7 @@ class HtmlFilter(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlFilter"""
         _html.HtmlFilter_swiginit(self,_html.new_HtmlFilter(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlFilter)
+        HtmlFilter._setCallbackInfo(self, self, HtmlFilter)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -983,7 +972,7 @@ class HtmlWindow(_windows.ScrolledWindow):
             String name=HtmlWindowNameStr) -> HtmlWindow
         """
         _html.HtmlWindow_swiginit(self,_html.new_HtmlWindow(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)
+        self._setOORInfo(self);HtmlWindow._setCallbackInfo(self, self, HtmlWindow)
 
     def Create(*args, **kwargs):
         """
@@ -1630,7 +1619,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):