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
This commit is contained in:
@@ -481,7 +481,7 @@ class MySplashScreen(wxSplashScreen):
|
|||||||
frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
|
frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
|
||||||
frame.Show(true)
|
frame.Show(true)
|
||||||
self.ShowTip(frame)
|
self.ShowTip(frame)
|
||||||
evt.Skip()
|
self.Destroy()
|
||||||
|
|
||||||
def ShowTip(self, frame):
|
def ShowTip(self, frame):
|
||||||
try:
|
try:
|
||||||
|
@@ -51,8 +51,10 @@ class TestVirtualList(wxListCtrl):
|
|||||||
def OnGetItemText(self, item, col):
|
def OnGetItemText(self, item, col):
|
||||||
return "Item %d, column %d" % (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):
|
def OnGetItemAttr(self, item):
|
||||||
if item % 3 == 1:
|
if item % 3 == 1:
|
||||||
|
@@ -18,8 +18,8 @@ class MyHtmlWindow(wxHtmlWindow):
|
|||||||
EVT_SCROLLWIN( self, self.OnScroll )
|
EVT_SCROLLWIN( self, self.OnScroll )
|
||||||
|
|
||||||
def OnScroll( self, event ):
|
def OnScroll( self, event ):
|
||||||
print 'event.GetOrientation()',event.GetOrientation()
|
#print 'event.GetOrientation()',event.GetOrientation()
|
||||||
print 'event.GetPosition()',event.GetPosition()
|
#print 'event.GetPosition()',event.GetPosition()
|
||||||
event.Skip()
|
event.Skip()
|
||||||
|
|
||||||
|
|
||||||
@@ -62,32 +62,33 @@ class TestHtmlPanel(wxPanel):
|
|||||||
self.box.Add(self.html, 1, wxGROW)
|
self.box.Add(self.html, 1, wxGROW)
|
||||||
|
|
||||||
subbox = wxBoxSizer(wxHORIZONTAL)
|
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")
|
btn = wxButton(self, -1, "Load File")
|
||||||
EVT_BUTTON(self, 1202, self.OnLoadFile)
|
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")
|
btn = wxButton(self, -1, "Load URL")
|
||||||
EVT_BUTTON(self, 1203, self.OnWithWidgets)
|
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")
|
btn = wxButton(self, -1, "With Widgets")
|
||||||
EVT_BUTTON(self, 1204, self.OnBack)
|
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")
|
btn = wxButton(self, -1, "Back")
|
||||||
EVT_BUTTON(self, 1205, self.OnForward)
|
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")
|
btn = wxButton(self, -1, "Forward")
|
||||||
EVT_BUTTON(self, 1207, self.OnPrint)
|
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")
|
btn = wxButton(self, -1, "Print")
|
||||||
EVT_BUTTON(self, 1206, self.OnViewSource)
|
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)
|
subbox.Add(btn, 1, wxGROW | wxALL, 2)
|
||||||
|
|
||||||
self.box.Add(subbox, 0, wxGROW)
|
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):
|
def OnShowDefault(self, event):
|
||||||
name = os.path.join(self.cwd, opj('data/test.htm'))
|
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):
|
def OnWithWidgets(self, event):
|
||||||
os.chdir(self.cwd)
|
os.chdir(self.cwd)
|
||||||
name = os.path.join(self.cwd, opj('data/widgetTest.htm'))
|
name = os.path.join(self.cwd, opj('data/widgetTest.htm'))
|
||||||
|
@@ -6,7 +6,7 @@ from wxPython.wx import *
|
|||||||
def runTest(frame, nb, log):
|
def runTest(frame, nb, log):
|
||||||
dlg = wxTextEntryDialog(frame, 'What is your favorite programming language?',
|
dlg = wxTextEntryDialog(frame, 'What is your favorite programming language?',
|
||||||
'Duh??', 'Python')
|
'Duh??', 'Python')
|
||||||
dlg.SetValue("Python is the best!") #### this doesn't work?
|
dlg.SetValue("Python is the best!")
|
||||||
if dlg.ShowModal() == wxID_OK:
|
if dlg.ShowModal() == wxID_OK:
|
||||||
log.WriteText('You entered: %s\n' % dlg.GetValue())
|
log.WriteText('You entered: %s\n' % dlg.GetValue())
|
||||||
dlg.Destroy()
|
dlg.Destroy()
|
||||||
|
Reference in New Issue
Block a user