The great wxVScrolledWindow refactoring: allow using it both horizontal and

[wxWidgets.git] / wxPython / demo / HtmlWindow.py
diff --git a/wxPython/demo/HtmlWindow.py b/wxPython/demo/HtmlWindow.py

index edfe7027b674e1af1c9c95c7ec072cc7e1124ecc..42e24bddd66d0b15698baa169b6ad29cef83a93b 100644 (file)
--- a/wxPython/demo/HtmlWindow.py
+++ b/wxPython/demo/HtmlWindow.py
@@ -1,15 +1,3 @@
-# 11/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
-# 12/13/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o got the wxpTag stuff working right.
-# 
-# 12/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o wxScrolledMessageDialog -> ScrolledMessageDialog
-# 
  
  import  os
  import  sys
@@ -28,31 +16,28 @@ 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
-        self.Bind(wx.EVT_SCROLLWIN, self.OnScroll )
-
-    def OnScroll( self, event ):
-        #print 'event.GetOrientation()',event.GetOrientation()
-        #print 'event.GetPosition()',event.GetPosition()
-        event.Skip()
+        if "gtk2" in wx.PlatformInfo:
+            self.SetStandardFonts()
  
      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)
-        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))
-        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))
-        self.base_OnCellClicked(cell, x, y, evt)
+        if isinstance(cell, html.HtmlWordCell):
+            sel = html.HtmlSelection()
+            self.log.WriteText('     %s\n' % cell.ConvertToText(sel))
+        super(MyHtmlWindow, self).OnCellClicked(cell, x, y, evt)
+
  
  
  # This filter doesn't really do anything but show how to use filters
@@ -203,7 +188,6 @@ class TestHtmlPanel(wx.Panel):
  
  def runTest(frame, nb, log):
      win = TestHtmlPanel(nb, frame, log)
-    print wx.Window_FindFocus()
      return win
  
  
@@ -211,9 +195,9 @@ def runTest(frame, nb, log):
  
  
  overview = """<html><body>
-<h2>wxHtmlWindow</h2>
+<h2>wx.HtmlWindow</h2>
  
-<p>wxHtmlWindow is capable of parsing and rendering most
+<p>wx.HtmlWindow is capable of parsing and rendering most
  simple HTML tags.
  
  <p>It is not intended to be a high-end HTML browser.  If you're
@@ -228,7 +212,7 @@ wraps the core MSIE HTML viewer.
  if __name__ == '__main__':
      import sys,os
      import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])