Changes to how overridable C++ methods are virtualized for Python.

[wxWidgets.git] / wxPython / demo / HtmlWindow.py

diff --git a/wxPython/demo/HtmlWindow.py b/wxPython/demo/HtmlWindow.py
index 0374604f14ef3cc2c9b58189937e4ce8a9651703..3e39f7ebd551771bccf1c2db7d4c213b0cfc94fa 100644 (file)
--- a/wxPython/demo/HtmlWindow.py
+++ b/wxPython/demo/HtmlWindow.py
@@ -16,33 +16,25 @@ class MyHtmlWindow(html.HtmlWindow):
     def __init__(self, parent, id, log):
         html.HtmlWindow.__init__(self, parent, id, style=wx.NO_FULL_REPAINT_ON_RESIZE)
         self.log = log
     def __init__(self, parent, id, log):
         html.HtmlWindow.__init__(self, parent, id, style=wx.NO_FULL_REPAINT_ON_RESIZE)
         self.log = log

-        self.Bind(wx.EVT_SCROLLWIN, self.OnScroll )

         if "gtk2" in wx.PlatformInfo:
             self.SetStandardFonts()
 
         if "gtk2" in wx.PlatformInfo:
             self.SetStandardFonts()
 

-    def OnScroll( self, event ):
-        #print 'event.GetOrientation()',event.GetOrientation()
-        #print 'event.GetPosition()',event.GetPosition()
-        event.Skip()
-

     def OnLinkClicked(self, linkinfo):
         self.log.WriteText('OnLinkClicked: %s\n' % linkinfo.GetHref())
     def OnLinkClicked(self, linkinfo):
         self.log.WriteText('OnLinkClicked: %s\n' % linkinfo.GetHref())

-
-        # Virtuals in the base class have been renamed with base_ on the front.
-        self.base_OnLinkClicked(linkinfo)
-
+        super(MyHtmlWindow, self).OnLinkClicked(linkinfo)

 
     def OnSetTitle(self, title):
         self.log.WriteText('OnSetTitle: %s\n' % title)
 
     def OnSetTitle(self, title):
         self.log.WriteText('OnSetTitle: %s\n' % title)

-        self.base_OnSetTitle(title)
+        super(MyHtmlWindow, self).OnSetTitle(title)

 
     def OnCellMouseHover(self, cell, x, y):
         self.log.WriteText('OnCellMouseHover: %s, (%d %d)\n' % (cell, x, y))
 
     def OnCellMouseHover(self, cell, x, y):
         self.log.WriteText('OnCellMouseHover: %s, (%d %d)\n' % (cell, x, y))

-        self.base_OnCellMouseHover(cell, x, y)
+        super(MyHtmlWindow, self).OnCellMouseHover(cell, x, y)

 
     def OnCellClicked(self, cell, x, y, evt):
         self.log.WriteText('OnCellClicked: %s, (%d %d)\n' % (cell, x, y))
 
     def OnCellClicked(self, cell, x, y, evt):
         self.log.WriteText('OnCellClicked: %s, (%d %d)\n' % (cell, x, y))

-        self.base_OnCellClicked(cell, x, y, evt)
+        super(MyHtmlWindow, self).OnCellClicked(cell, x, y, evt)
+

 
 
 # This filter doesn't really do anything but show how to use filters
 
 
 # This filter doesn't really do anything but show how to use filters