Updates to match recent CVS changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,11 +10,18 @@ class TestPanel(wxPanel):
|
||||
wxPanel.__init__(self, parent, ID)
|
||||
self.log = log
|
||||
|
||||
cal = wxCalendarCtrl(self, 101, wxDateTime_Now(), pos = (25,50),
|
||||
cal = wxCalendarCtrl(self, -1, wxDateTime_Now(), pos = (25,50),
|
||||
style = wxCAL_SHOW_HOLIDAYS | wxCAL_SUNDAY_FIRST)
|
||||
|
||||
EVT_CALENDAR(self, 101, self.OnCalSelected)
|
||||
EVT_CALENDAR(self, cal.GetId(), self.OnCalSelected)
|
||||
|
||||
b = wxButton(self, -1, "Destroy the Calendar", pos = (250, 50))
|
||||
EVT_BUTTON(self, b.GetId(), self.OnButton)
|
||||
self.cal = cal
|
||||
|
||||
def OnButton(self, evt):
|
||||
self.cal.Destroy()
|
||||
self.cal = None
|
||||
|
||||
def OnCalSelected(self, evt):
|
||||
self.log.write('OnCalSelected: %s\n' % evt.GetDate())
|
||||
|
@@ -4,7 +4,7 @@ from wxPython.wx import *
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def runTest(frame, nb, log):
|
||||
win = wxDialog(frame, -1, "This is a wxDialog", size=wxSize(350, 200))
|
||||
win = wxDialog(frame, -1, "This is a wxDialog", size=wxSize(350, 200), style=wxCAPTION)
|
||||
|
||||
sizer = wxBoxSizer(wxVERTICAL)
|
||||
|
||||
|
@@ -16,9 +16,10 @@ import time
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
ID_Start = wxNewId()
|
||||
ID_Stop = wxNewId()
|
||||
ID_Timer = wxNewId()
|
||||
ID_Start = wxNewId()
|
||||
ID_Stop = wxNewId()
|
||||
ID_Timer = wxNewId()
|
||||
ID_Timer2 = wxNewId()
|
||||
|
||||
class TestTimerWin(wxPanel):
|
||||
def __init__(self, parent, log):
|
||||
@@ -34,22 +35,32 @@ class TestTimerWin(wxPanel):
|
||||
self.timer = wxTimer(self, # object to send the event to
|
||||
ID_Timer) # event id to use
|
||||
|
||||
self.timer2 = wxTimer(self, # object to send the event to
|
||||
ID_Timer2) # event id to use
|
||||
|
||||
EVT_BUTTON(self, ID_Start, self.OnStart)
|
||||
EVT_BUTTON(self, ID_Stop, self.OnStop)
|
||||
EVT_TIMER(self, ID_Timer, self.OnTimer)
|
||||
|
||||
EVT_TIMER(self, ID_Timer2, self.OnTimer2)
|
||||
|
||||
def OnStart(self, event):
|
||||
self.timer.Start(1000)
|
||||
self.timer2.Start(1500)
|
||||
|
||||
def OnStop(self, event):
|
||||
self.timer.Stop()
|
||||
self.timer2.Stop()
|
||||
|
||||
def OnTimer(self, event):
|
||||
wxBell()
|
||||
if self.log:
|
||||
self.log.WriteText('beep!\n')
|
||||
|
||||
def OnTimer2(self, event):
|
||||
wxBell()
|
||||
if self.log:
|
||||
self.log.WriteText('beep 2!\n')
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def runTest(frame, nb, log):
|
||||
|
Reference in New Issue
Block a user