From a1bfae9d8310335453cb475d73a92a4b13d006dd Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 21 Feb 2002 00:50:27 +0000
Subject: [PATCH] A few tweaks and some cleanup for the wxPython demo

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/demo/Main.py              |  2 +-
 wxPython/demo/VirtualListCtrl.py   |  4 ++-
 wxPython/demo/wxHtmlWindow.py      | 47 +++++++++++++++++-------------
 wxPython/demo/wxTextEntryDialog.py |  2 +-
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index db8bd91947..87fc85543c 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -481,7 +481,7 @@ class MySplashScreen(wxSplashScreen):
         frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
         frame.Show(true)
         self.ShowTip(frame)
-        evt.Skip()
+        self.Destroy()
 
     def ShowTip(self, frame):
         try:
diff --git a/wxPython/demo/VirtualListCtrl.py b/wxPython/demo/VirtualListCtrl.py
index 23b4b627da..b30b4caf4c 100644
--- a/wxPython/demo/VirtualListCtrl.py
+++ b/wxPython/demo/VirtualListCtrl.py
@@ -51,8 +51,10 @@ class TestVirtualList(wxListCtrl):
     def OnGetItemText(self, item, col):
         return "Item %d, column %d" % (item, col)
 
+
     def OnGetItemImage(self, item):
-        return 0
+        return -1  # if used you should return the index in the ImageList
+
 
     def OnGetItemAttr(self, item):
         if item % 3 == 1:
diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index 942dea6134..bdafa03d36 100644
--- a/wxPython/demo/wxHtmlWindow.py
+++ b/wxPython/demo/wxHtmlWindow.py
@@ -18,8 +18,8 @@ class MyHtmlWindow(wxHtmlWindow):
         EVT_SCROLLWIN( self, self.OnScroll )
 
     def OnScroll( self, event ):
-        print 'event.GetOrientation()',event.GetOrientation()
-        print 'event.GetPosition()',event.GetPosition()
+        #print 'event.GetOrientation()',event.GetOrientation()
+        #print 'event.GetPosition()',event.GetPosition()
         event.Skip()
 
 
@@ -62,32 +62,33 @@ class TestHtmlPanel(wxPanel):
         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, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1202, "Load File")
-        EVT_BUTTON(self, 1202, self.OnLoadFile)
+        btn = wxButton(self, -1, "Load File")
+        EVT_BUTTON(self, btn.GetId(), self.OnLoadFile)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1203, "With Widgets")
-        EVT_BUTTON(self, 1203, self.OnWithWidgets)
+        btn = wxButton(self, -1, "Load URL")
+        EVT_BUTTON(self, btn.GetId(), self.OnLoadURL)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1204, "Back")
-        EVT_BUTTON(self, 1204, self.OnBack)
+        btn = wxButton(self, -1, "With Widgets")
+        EVT_BUTTON(self, btn.GetId(), self.OnWithWidgets)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1205, "Forward")
-        EVT_BUTTON(self, 1205, self.OnForward)
+        btn = wxButton(self, -1, "Back")
+        EVT_BUTTON(self, btn.GetId(), self.OnBack)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1207, "Print")
-        EVT_BUTTON(self, 1207, self.OnPrint)
+        btn = wxButton(self, -1, "Forward")
+        EVT_BUTTON(self, btn.GetId(), self.OnForward)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        btn = wxButton(self, 1206, "View Source")
-        EVT_BUTTON(self, 1206, self.OnViewSource)
+        btn = wxButton(self, -1, "Print")
+        EVT_BUTTON(self, btn.GetId(), self.OnPrint)
+        subbox.Add(btn, 1, wxGROW | wxALL, 2)
+
+        btn = wxButton(self, -1, "View Source")
+        EVT_BUTTON(self, btn.GetId(), self.OnViewSource)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         self.box.Add(subbox, 0, wxGROW)
@@ -100,10 +101,6 @@ class TestHtmlPanel(wxPanel):
         self.OnShowDefault(None)
 
 
-##     def __del__(self):
-##         print 'TestHtmlPanel.__del__'
-
-
 
     def OnShowDefault(self, event):
         name = os.path.join(self.cwd, opj('data/test.htm'))
@@ -118,6 +115,14 @@ class TestHtmlPanel(wxPanel):
         dlg.Destroy()
 
 
+    def OnLoadURL(self, event):
+        dlg = wxTextEntryDialog(self, "Enter a URL")
+        if dlg.ShowModal():
+            url = dlg.GetValue()
+            self.html.LoadPage(url)
+        dlg.Destroy()
+
+
     def OnWithWidgets(self, event):
         os.chdir(self.cwd)
         name = os.path.join(self.cwd, opj('data/widgetTest.htm'))
diff --git a/wxPython/demo/wxTextEntryDialog.py b/wxPython/demo/wxTextEntryDialog.py
index b0049d6506..af93b747f3 100644
--- a/wxPython/demo/wxTextEntryDialog.py
+++ b/wxPython/demo/wxTextEntryDialog.py
@@ -6,7 +6,7 @@ from wxPython.wx import *
 def runTest(frame, nb, log):
     dlg = wxTextEntryDialog(frame, 'What is your favorite programming language?',
                             'Duh??', 'Python')
-    dlg.SetValue("Python is the best!")  #### this doesn't work?
+    dlg.SetValue("Python is the best!")
     if dlg.ShowModal() == wxID_OK:
         log.WriteText('You entered: %s\n' % dlg.GetValue())
     dlg.Destroy()
-- 
2.45.2