Added event class constructors

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

diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py
index afcba359bcf1bbaffb64433779a2c026f475b95f..808403f93eb814e6cdcbceab9c92a5743afda197 100644 (file)
--- 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
 
 #----------------------------------------------------------------------
@@ -34,35 +33,37 @@ class TestHtmlPanel(wxPanel):
         self.html.SetRelatedFrame(frame, "wxPython: (A Demonstration) -- %s")
         self.html.SetRelatedStatusBar(0)
 
-        self.box = box.wxBoxSizer(wxVERTICAL)
-        self.box.Add(self.html, 1)
+        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, 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,10 +72,6 @@ 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')