cache return value of wxGetOsVersion

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

diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index 69d1d12e02f4f7a952c28b3380de214845e7fe08..942dea61342a8b24654146df29cc486748706e13 100644 (file)
--- a/wxPython/demo/wxHtmlWindow.py
+++ b/wxPython/demo/wxHtmlWindow.py
@@ -5,6 +5,8 @@ from   wxPython.wx         import *
 from   wxPython.html       import *
 import wxPython.lib.wxpTag
 
 from   wxPython.html       import *
 import wxPython.lib.wxpTag
 

+from Main import opj
+

 #----------------------------------------------------------------------
 
 # This shows how to catch the OnLinkClicked non-event.  (It's a virtual
 #----------------------------------------------------------------------
 
 # This shows how to catch the OnLinkClicked non-event.  (It's a virtual


@@ -32,8 +34,13 @@ class MyHtmlWindow(wxHtmlWindow):
         self.log.WriteText('OnSetTitle: %s\n' % title)
         self.base_OnSetTitle(title)
 
         self.log.WriteText('OnSetTitle: %s\n' % title)
         self.base_OnSetTitle(title)
 

-##     def __del__(self):
-##         print 'MyHtmlWindow.__del__'
+    def OnCellMouseHover(self, cell, x, y):
+        self.log.WriteText('OnCellMouseHover: %s, (%d %d)\n' % (cell, x, y))
+        self.base_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)

 
 
 class TestHtmlPanel(wxPanel):
 
 
 class TestHtmlPanel(wxPanel):


@@ -99,7 +106,7 @@ class TestHtmlPanel(wxPanel):
 
 
     def OnShowDefault(self, event):
 
 
     def OnShowDefault(self, event):

-        name = os.path.join(self.cwd, 'data/test.htm')
+        name = os.path.join(self.cwd, opj('data/test.htm'))

         self.html.LoadPage(name)
 
 
         self.html.LoadPage(name)
 
 


@@ -113,7 +120,7 @@ class TestHtmlPanel(wxPanel):
 
     def OnWithWidgets(self, event):
         os.chdir(self.cwd)
 
     def OnWithWidgets(self, event):
         os.chdir(self.cwd)

-        name = os.path.join(self.cwd, 'data/widgetTest.htm')
+        name = os.path.join(self.cwd, opj('data/widgetTest.htm'))

         self.html.LoadPage(name)
 
 
         self.html.LoadPage(name)