X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae920857a74f858f98d0d68f55f6a77de0d8f2cf..e32352cf6600deac48d15fe1ca2ba74f3352922c:/utils/wxPython/demo/wxHtmlWindow.py

diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py
index 222918f53d..eb2aac73e3 100644
--- a/utils/wxPython/demo/wxHtmlWindow.py
+++ b/utils/wxPython/demo/wxHtmlWindow.py
@@ -14,12 +14,20 @@ class MyHtmlWindow(wxHtmlWindow):
         wxHtmlWindow.__init__(self, parent, id)
         self.log = log
 
-    def OnLinkClicked(self, link):
-        self.log.WriteText('OnLinkClicked: %s\n' % link)
 
-        # Virtuals in the base class have been renamed with base_ on the font.
-        self.base_OnLinkClicked(link)
+    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)
+
+
+    def OnSetTitle(self, title):
+        self.log.WriteText('OnSetTitle: %s\n' % title)
+        self.base_OnSetTitle(title)
+
+##     def __del__(self):
+##         print 'MyHtmlWindow.__del__'
 
 
 class TestHtmlPanel(wxPanel):
@@ -31,18 +39,19 @@ class TestHtmlPanel(wxPanel):
         if not self.cwd:
             self.cwd = os.getcwd()
 
-
         self.html = MyHtmlWindow(self, -1, log)
         self.html.SetRelatedFrame(frame, "wxPython: (A Demonstration) -- %s")
         self.html.SetRelatedStatusBar(0)
 
+        self.printer = wxHtmlEasyPrinting()
+
         self.box = wxBoxSizer(wxVERTICAL)
         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, 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)
@@ -60,6 +69,10 @@ class TestHtmlPanel(wxPanel):
         EVT_BUTTON(self, 1205, self.OnForward)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
+        btn = wxButton(self, 1207, "Print")
+        EVT_BUTTON(self, 1207, self.OnPrint)
+        subbox.Add(btn, 1, wxGROW | wxALL, 2)
+
         btn = wxButton(self, 1206, "View Source")
         EVT_BUTTON(self, 1206, self.OnViewSource)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
@@ -74,6 +87,9 @@ class TestHtmlPanel(wxPanel):
         self.OnShowDefault(None)
 
 
+##     def __del__(self):
+##         print 'TestHtmlPanel.__del__'
+
 
 
     def OnShowDefault(self, event):
@@ -90,7 +106,6 @@ class TestHtmlPanel(wxPanel):
 
 
     def OnWithWidgets(self, event):
-        print self.cwd
         os.chdir(self.cwd)
         name = os.path.join(self.cwd, 'data/widgetTest.htm')
         self.html.LoadPage(name)
@@ -117,6 +132,9 @@ class TestHtmlPanel(wxPanel):
         dlg.Destroy()
 
 
+    def OnPrint(self, event):
+        self.printer.PrintFile(self.html.GetOpenedPage())
+
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):