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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index db8bd91947c28ebe2bc6916f933cfbcd8cd731b7..87fc85543cfe64ee616385926c1e7cabf92b7460 100644 (file)
--- 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)
         frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
         frame.Show(true)
         self.ShowTip(frame)

-        evt.Skip()
+        self.Destroy()

 
     def ShowTip(self, frame):
         try:
 
     def ShowTip(self, frame):
         try:

diff --git a/wxPython/demo/VirtualListCtrl.py b/wxPython/demo/VirtualListCtrl.py
index 23b4b627da7dcb580e45ca9964a69b6f13190ee1..b30b4caf4c7f9ebaa4098d4c5c6507c8cca9e764 100644 (file)
--- 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 OnGetItemText(self, item, col):
         return "Item %d, column %d" % (item, col)
 

+

     def OnGetItemImage(self, item):
     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:
 
     def OnGetItemAttr(self, item):
         if item % 3 == 1:

diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index 942dea61342a8b24654146df29cc486748706e13..bdafa03d36a19cbee616cafa9c677636e0108037 100644 (file)
--- 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 ):
         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()
 
 
         event.Skip()
 
 


@@ -62,32 +62,33 @@ class TestHtmlPanel(wxPanel):
         self.box.Add(self.html, 1, wxGROW)
 
         subbox = wxBoxSizer(wxHORIZONTAL)
         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)
 
         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)
 
         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)
 
         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)
 
         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)
 
         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)
         subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         self.box.Add(subbox, 0, wxGROW)


@@ -100,10 +101,6 @@ class TestHtmlPanel(wxPanel):
         self.OnShowDefault(None)
 
 
         self.OnShowDefault(None)
 
 

-##     def __del__(self):
-##         print 'TestHtmlPanel.__del__'
-
-

 
     def OnShowDefault(self, event):
         name = os.path.join(self.cwd, opj('data/test.htm'))
 
     def OnShowDefault(self, event):
         name = os.path.join(self.cwd, opj('data/test.htm'))


@@ -118,6 +115,14 @@ class TestHtmlPanel(wxPanel):
         dlg.Destroy()
 
 
         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'))
     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 b0049d6506d0509575977c90444a63d4f27779ea..af93b747f3d40d3407e628343354640edab66d49 100644 (file)
--- 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')
 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()
     if dlg.ShowModal() == wxID_OK:
         log.WriteText('You entered: %s\n' % dlg.GetValue())
     dlg.Destroy()