X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e166644c534521f311e4f010b0829c7c9951e7a3..899493dd6179f91eb97a39339cdcc08b89885a98:/utils/wxPython/demo/wxHtmlWindow.py
diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py
index afcba359bc..9b187a129b 100644
--- a/utils/wxPython/demo/wxHtmlWindow.py
+++ b/utils/wxPython/demo/wxHtmlWindow.py
@@ -3,7 +3,6 @@ import sys, os
from wxPython.wx import *
from wxPython.html import *
-from wxPython.lib.sizers import *
import wxPython.lib.wxpTag
#----------------------------------------------------------------------
@@ -28,41 +27,52 @@ class TestHtmlPanel(wxPanel):
wxPanel.__init__(self, parent, -1)
self.log = log
self.frame = frame
+ self.cwd = os.path.split(sys.argv[0])[0]
+ 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.box = box.wxBoxSizer(wxVERTICAL)
- self.box.Add(self.html, 1)
+ 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)
+ subbox.Add(btn, 1, wxGROW | wxALL, 2)
btn = wxButton(self, 1202, "Load File")
EVT_BUTTON(self, 1202, self.OnLoadFile)
- subbox.Add(btn, 1)
+ subbox.Add(btn, 1, wxGROW | wxALL, 2)
btn = wxButton(self, 1203, "With Widgets")
EVT_BUTTON(self, 1203, self.OnWithWidgets)
- subbox.Add(btn, 1)
+ subbox.Add(btn, 1, wxGROW | wxALL, 2)
btn = wxButton(self, 1204, "Back")
EVT_BUTTON(self, 1204, self.OnBack)
- subbox.Add(btn, 1)
+ subbox.Add(btn, 1, wxGROW | wxALL, 2)
btn = wxButton(self, 1205, "Forward")
EVT_BUTTON(self, 1205, self.OnForward)
- subbox.Add(btn, 1)
+ 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)
+ subbox.Add(btn, 1, wxGROW | wxALL, 2)
- self.box.Add(subbox)
+ self.box.Add(subbox, 0, wxGROW)
+ self.SetSizer(self.box)
+ self.SetAutoLayout(true)
# A button with this ID is created on the widget test page.
EVT_BUTTON(self, wxID_OK, self.OnOk)
@@ -71,13 +81,9 @@ class TestHtmlPanel(wxPanel):
- def OnSize(self, event):
- size = self.GetClientSize()
- self.box.Layout(size)
-
def OnShowDefault(self, event):
- name = os.path.join(os.path.split(sys.argv[0])[0], 'data/test.htm')
+ name = os.path.join(self.cwd, 'data/test.htm')
self.html.LoadPage(name)
@@ -90,10 +96,10 @@ class TestHtmlPanel(wxPanel):
def OnWithWidgets(self, event):
- os.chdir(os.path.split(sys.argv[0])[0])
- name = os.path.join(os.path.split(sys.argv[0])[0], 'data/widgetTest.htm')
+ os.chdir(self.cwd)
+ name = os.path.join(self.cwd, 'data/widgetTest.htm')
self.html.LoadPage(name)
- #self.html.SetPage(_widgetTest)
+
def OnOk(self, event):
self.log.WriteText("It works!\n")
@@ -116,6 +122,9 @@ class TestHtmlPanel(wxPanel):
dlg.Destroy()
+ def OnPrint(self, event):
+ self.printer.PrintFile(self.html.GetOpenedPage())
+
#----------------------------------------------------------------------
def runTest(frame, nb, log):
@@ -140,22 +149,6 @@ It is not intended to be a high-end HTML browser. If you're looking for somethi
-_widgetTest = '''\
-
-The widgets on this page were created dynamically on the fly by a custom
-wxTagHandler found in wxPython.lib.wxpTag.
-
-
-
-
-
-
-
-
-
-after
-
-'''