fix text scrolling in GTK2 (patch 703988)

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

diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index 942dea61342a8b24654146df29cc486748706e13..dc87749b14b964f3e3eafe66a9596a962ac38171 100644 (file)
--- a/wxPython/demo/wxHtmlWindow.py
+++ b/wxPython/demo/wxHtmlWindow.py
@@ -13,13 +13,13 @@ from Main import opj
 # method in the C++ code...)
 class MyHtmlWindow(wxHtmlWindow):
     def __init__(self, parent, id, log):
-        wxHtmlWindow.__init__(self, parent, id)
+        wxHtmlWindow.__init__(self, parent, id, style=wxNO_FULL_REPAINT_ON_RESIZE)
         self.log = log
         EVT_SCROLLWIN( self, self.OnScroll )
 
     def OnScroll( self, event ):
-        print 'event.GetOrientation()',event.GetOrientation()
-        print 'event.GetPosition()',event.GetPosition()
+        #print 'event.GetOrientation()',event.GetOrientation()
+        #print 'event.GetPosition()',event.GetPosition()
         event.Skip()
 
 
@@ -43,17 +43,38 @@ class MyHtmlWindow(wxHtmlWindow):
         self.base_OnCellClicked(cell, x, y, evt)
 
 
+# This filter doesn't really do anything but show how to use filters
+class MyHtmlFilter(wxHtmlFilter):
+    def __init__(self, log):
+        wxHtmlFilter.__init__(self)
+        self.log = log
+
+    # This method decides if this filter is able to read the file
+    def CanRead(self, fsfile):
+        self.log.write("CanRead: %s\n" % fsfile.GetMimeType())
+        return False
+
+    # If CanRead returns True then this method is called to actually
+    # read the file and return the contents.
+    def ReadFile(self, fsfile):
+        return ""
+
+
 class TestHtmlPanel(wxPanel):
     def __init__(self, parent, frame, log):
-        wxPanel.__init__(self, parent, -1)
+        wxPanel.__init__(self, parent, -1, style=wxNO_FULL_REPAINT_ON_RESIZE)
         self.log = log
         self.frame = frame
         self.cwd = os.path.split(sys.argv[0])[0]
         if not self.cwd:
             self.cwd = os.getcwd()
+        if frame:
+            self.titleBase = frame.GetTitle()
+
+        wxHtmlWindow_AddFilter(MyHtmlFilter(log))
 
         self.html = MyHtmlWindow(self, -1, log)
-        self.html.SetRelatedFrame(frame, "wxPython: (A Demonstration) -- %s")
+        self.html.SetRelatedFrame(frame, self.titleBase + " -- %s")
         self.html.SetRelatedStatusBar(0)
 
         self.printer = wxHtmlEasyPrinting()
@@ -62,37 +83,38 @@ class TestHtmlPanel(wxPanel):
         self.box.Add(self.html, 1, wxGROW)
 
         subbox = wxBoxSizer(wxHORIZONTAL)
-##         btn = wxButton(self, 1201, "Show Default")
-##         EVT_BUTTON(self, 1201, self.OnShowDefault)
-##         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1202, "Load File")
-        EVT_BUTTON(self, 1202, self.OnLoadFile)
+        btn = wxButton(self, -1, "Load File")
+        EVT_BUTTON(self, btn.GetId(), self.OnLoadFile)
+        subbox.Add(btn, 1, wxGROW | wxALL, 2)
+
+        btn = wxButton(self, -1, "Load URL")
+        EVT_BUTTON(self, btn.GetId(), self.OnLoadURL)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1203, "With Widgets")
-        EVT_BUTTON(self, 1203, self.OnWithWidgets)
+        btn = wxButton(self, -1, "With Widgets")
+        EVT_BUTTON(self, btn.GetId(), self.OnWithWidgets)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1204, "Back")
-        EVT_BUTTON(self, 1204, self.OnBack)
+        btn = wxButton(self, -1, "Back")
+        EVT_BUTTON(self, btn.GetId(), self.OnBack)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1205, "Forward")
-        EVT_BUTTON(self, 1205, self.OnForward)
+        btn = wxButton(self, -1, "Forward")
+        EVT_BUTTON(self, btn.GetId(), self.OnForward)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1207, "Print")
-        EVT_BUTTON(self, 1207, self.OnPrint)
+        btn = wxButton(self, -1, "Print")
+        EVT_BUTTON(self, btn.GetId(), self.OnPrint)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1206, "View Source")
-        EVT_BUTTON(self, 1206, self.OnViewSource)
+        btn = wxButton(self, -1, "View Source")
+        EVT_BUTTON(self, btn.GetId(), self.OnViewSource)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         self.box.Add(subbox, 0, wxGROW)
         self.SetSizer(self.box)
-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)
 
         # A button with this ID is created on the widget test page.
         EVT_BUTTON(self, wxID_OK, self.OnOk)
@@ -100,9 +122,10 @@ class TestHtmlPanel(wxPanel):
         self.OnShowDefault(None)
 
 
-##     def __del__(self):
-##         print 'TestHtmlPanel.__del__'
-
+    def ShutdownDemo(self):
+        # put the frame title back
+        if self.frame:
+            self.frame.SetTitle(self.titleBase)
 
 
     def OnShowDefault(self, event):
@@ -118,6 +141,14 @@ class TestHtmlPanel(wxPanel):
         dlg.Destroy()
 
 
+    def OnLoadURL(self, event):
+        dlg = wxTextEntryDialog(self, "Enter a URL")
+        if dlg.ShowModal():
+            url = dlg.GetValue()
+            self.html.LoadPage(url)
+        dlg.Destroy()
+
+
     def OnWithWidgets(self, event):
         os.chdir(self.cwd)
         name = os.path.join(self.cwd, opj('data/widgetTest.htm'))
@@ -153,6 +184,7 @@ class TestHtmlPanel(wxPanel):
 
 def runTest(frame, nb, log):
     win = TestHtmlPanel(nb, frame, log)
+    print wxWindow_FindFocus()
     return win
 
 
@@ -162,15 +194,27 @@ def runTest(frame, nb, log):
 
 
 
-overview = """\
-wxHtmlWindow is capable of parsing and rendering most simple HTML tags.
+overview = """<html><body>
+<h2>wxHtmlWindow</h2>
+
+<p>wxHtmlWindow is capable of parsing and rendering most
+simple HTML tags.
 
-It is not intended to be a high-end HTML browser.  If you're looking for something like that try http://www.mozilla.org - there's a chance you'll be able to make their widget wxWindows-compatible. I'm sure everyone will enjoy your work in that case...
+<p>It is not intended to be a high-end HTML browser.  If you're
+looking for something like that try http://www.mozilla.org - there's a
+chance you'll be able to make their widget wxWindows-compatible. I'm
+sure everyone will enjoy your work in that case...
 
+</body></html>
 """
 
 
 
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+