Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py
index c863001ff41a0c95a8835bc8d9f44a03b452159f..15d437e4b9a7127b6ba6e5879f7198e6ae377b55 100644 (file)
--- a/utils/wxPython/demo/wxHtmlWindow.py
+++ b/utils/wxPython/demo/wxHtmlWindow.py
@@ -14,11 +14,17 @@ class MyHtmlWindow(wxHtmlWindow):
         wxHtmlWindow.__init__(self, parent, id)
         self.log = log
 
-    def OnLinkClicked(self, link):
-        self.log.WriteText('OnLinkClicked: %s\n' % 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 font.
-        self.base_OnLinkClicked(link)
+        self.base_OnLinkClicked(linkinfo)
+
+
+    def OnSetTitle(self, title):
+        self.log.WriteText('OnSetTitle: %s\n' % title)
+        self.base_OnSetTitle(title)
 
 
 
@@ -36,6 +42,8 @@ class TestHtmlPanel(wxPanel):
         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)
 
@@ -60,6 +68,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)
@@ -116,6 +128,9 @@ class TestHtmlPanel(wxPanel):
         dlg.Destroy()
 
 
+    def OnPrint(self, event):
+        self.printer.PrintFile(self.html.GetOpenedPage())
+
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):