From 57cb8e4e82bd347e856a661b19ffba1c9e1d2e09 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 15 Jan 2003 20:46:53 +0000
Subject: [PATCH] Usability fixes for the demo

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/demo/ActiveXWrapper_IE.py |  6 ++++++
 wxPython/demo/MDIDemo.py           | 25 +++++++++++++++++++++++++
 wxPython/demo/Main.py              |  2 +-
 wxPython/demo/wxHtmlWindow.py      |  9 ++++++++-
 wxPython/demo/wxIEHtmlWin.py       |  6 ++++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/wxPython/demo/ActiveXWrapper_IE.py b/wxPython/demo/ActiveXWrapper_IE.py
index 2e23f54545..7a0caee5d0 100644
--- a/wxPython/demo/ActiveXWrapper_IE.py
+++ b/wxPython/demo/ActiveXWrapper_IE.py
@@ -107,6 +107,12 @@ class TestPanel(wxWindow):
         EVT_WINDOW_DESTROY(self, self.OnDestroy)
 
 
+    def ShutdownDemo(self):
+        # put the frame title back
+        if self.frame:
+            self.frame.SetTitle(self.titleBase)
+
+
     def OnDestroy(self, evt):
         if self.ie:
             self.ie.Cleanup()
diff --git a/wxPython/demo/MDIDemo.py b/wxPython/demo/MDIDemo.py
index 3ae510ea7c..fd0d15fdb1 100644
--- a/wxPython/demo/MDIDemo.py
+++ b/wxPython/demo/MDIDemo.py
@@ -3,6 +3,9 @@
 from wxPython.wx import *
 from wxScrolledWindow import MyCanvas
 
+import images
+SHOW_BACKGROUND = 1
+
 #----------------------------------------------------------------------
 
 class MyParentFrame(wxMDIParentFrame):
@@ -24,6 +27,10 @@ class MyParentFrame(wxMDIParentFrame):
         EVT_MENU(self, 5000, self.OnNewWindow)
         EVT_MENU(self, 5001, self.OnExit)
 
+        if SHOW_BACKGROUND:
+            self.bg_bmp = images.getGridBGBitmap()
+            EVT_ERASE_BACKGROUND(self.GetClientWindow(), self.OnEraseBackground)
+
 
     def OnExit(self, evt):
         self.Close(true)
@@ -36,6 +43,24 @@ class MyParentFrame(wxMDIParentFrame):
         win.Show(true)
 
 
+    def OnEraseBackground(self, evt):
+        dc = evt.GetDC()
+        if not dc:
+            dc = wxClientDC(self.GetClientWindow())
+
+        # tile the background bitmap
+        sz = self.GetClientSize()
+        w = self.bg_bmp.GetWidth()
+        h = self.bg_bmp.GetHeight()
+        x = 0
+        while x < sz.width:
+            y = 0
+            while y < sz.height:
+                dc.DrawBitmap(self.bg_bmp, x, y)
+                y = y + h
+            x = x + w
+
+
 #----------------------------------------------------------------------
 
 if __name__ == '__main__':
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 970fcea689..6f32239420 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -161,7 +161,7 @@ _treeList = [
         ]),
 
     # Images
-    ('Images', [
+    ('Using Images', [
         'Throbber',
         'wxDragImage',
         'wxImage',
diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index 621c3959c8..1e3146396b 100644
--- a/wxPython/demo/wxHtmlWindow.py
+++ b/wxPython/demo/wxHtmlWindow.py
@@ -68,11 +68,13 @@ class TestHtmlPanel(wxPanel):
         self.cwd = os.path.split(sys.argv[0])[0]
         if not self.cwd:
             self.cwd = os.getcwd()
+        if frame:
+            self.titleBase = frame.GetTitle()
 
         wxHtmlWindow_AddFilter(MyHtmlFilter(log))
 
         self.html = MyHtmlWindow(self, -1, log)
-        self.html.SetRelatedFrame(frame, "wxPython: (A Demonstration) -- %s")
+        self.html.SetRelatedFrame(frame, self.titleBase + " -- %s")
         self.html.SetRelatedStatusBar(0)
 
         self.printer = wxHtmlEasyPrinting()
@@ -120,6 +122,11 @@ class TestHtmlPanel(wxPanel):
         self.OnShowDefault(None)
 
 
+    def ShutdownDemo(self):
+        # put the frame title back
+        if self.frame:
+            self.frame.SetTitle(self.titleBase)
+
 
     def OnShowDefault(self, event):
         name = os.path.join(self.cwd, opj('data/test.htm'))
diff --git a/wxPython/demo/wxIEHtmlWin.py b/wxPython/demo/wxIEHtmlWin.py
index cad8b8bafd..dd9cb4479b 100644
--- a/wxPython/demo/wxIEHtmlWin.py
+++ b/wxPython/demo/wxIEHtmlWin.py
@@ -80,6 +80,12 @@ class TestPanel(wxWindow):
         EVT_MSHTML_TITLECHANGE(self, -1, self.OnTitleChange)
 
 
+    def ShutdownDemo(self):
+        # put the frame title back
+        if self.frame:
+            self.frame.SetTitle(self.titleBase)
+
+
     def OnSize(self, evt):
         self.Layout()