1. Grid cell defaults are now handled by an internal

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

diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py
index c863001ff41a0c95a8835bc8d9f44a03b452159f..5991378be85f447eabcfd04a6333ec754fe7cea4 100644 (file)
--- 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
 
         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):
 
 
 class TestHtmlPanel(wxPanel):


@@ -31,11 +39,12 @@ class TestHtmlPanel(wxPanel):
         if not self.cwd:
             self.cwd = os.getcwd()
 
         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.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)
 
         self.box = wxBoxSizer(wxVERTICAL)
         self.box.Add(self.html, 1, wxGROW)
 


@@ -60,6 +69,10 @@ class TestHtmlPanel(wxPanel):
         EVT_BUTTON(self, 1205, self.OnForward)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         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)
         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)
 
 
         self.OnShowDefault(None)
 
 

+    def __del__(self):
+        print 'TestHtmlPanel.__del__'
+

 
 
     def OnShowDefault(self, event):
 
 
     def OnShowDefault(self, event):


@@ -116,6 +132,9 @@ class TestHtmlPanel(wxPanel):
         dlg.Destroy()
 
 
         dlg.Destroy()
 
 

+    def OnPrint(self, event):
+        self.printer.PrintFile(self.html.GetOpenedPage())
+

 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):