Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-04 11:00:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Various demo tweaks and fixes

Browse Source
This commit is contained in:
Robin Dunn
2016-07-25 21:25:09 -07:00
parent 9cb833a2f1
commit d63ae92c20
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Calendar.py
View File

@@ -416,7 +416,7 @@ class PrintCalend:
printout2 = SetPrintout(self) printout2 = SetPrintout(self)
self.preview = wx.PrintPreview(printout, printout2, self.printData) self.preview = wx.PrintPreview(printout, printout2, self.printData)
if not self.preview.Ok(): if not self.preview.IsOk():
wx.MessageBox("There was a problem printing!", "Printing", wx.OK) wx.MessageBox("There was a problem printing!", "Printing", wx.OK)
return return

28
demo/CalendarCtrl.py
View File

@@ -2,7 +2,7 @@
import wx import wx
import wx.adv import wx.adv
from wx.adv import CalendarCtrl from wx.adv import CalendarCtrl, GenericCalendarCtrl, CalendarDateAttr
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@@ -28,13 +28,13 @@ class TestPanel(wx.Panel):
txt = wx.StaticText(self, -1, description) txt = wx.StaticText(self, -1, description)
txt.Wrap(300) txt.Wrap(300)
# cal = self.cal = GenericCalendarCtrl(self, -1, wx.DateTime().Today(), cal = GenericCalendarCtrl(self, -1, wx.DateTime().Today(),
# style = wx.adv.CAL_SHOW_HOLIDAYS style = wx.adv.CAL_SHOW_HOLIDAYS
# | wx.adv.CAL_SUNDAY_FIRST | wx.adv.CAL_SUNDAY_FIRST
# | wx.adv.CAL_SEQUENTIAL_MONTH_SELECTION | wx.adv.CAL_SEQUENTIAL_MONTH_SELECTION
# ) )
# cal2 = wxcal.GenericCalendarCtrl(self, -1, wx.DateTime().Today()) cal2 = GenericCalendarCtrl(self, -1, wx.DateTime().Today())
# Track a few holidays # Track a few holidays
@@ -43,9 +43,9 @@ class TestPanel(wx.Panel):
# bind some event handlers to each calendar # bind some event handlers to each calendar
for c in [native]:#, cal, cal2 for c in [native, cal, cal2]:
c.Bind(wx.adv.EVT_CALENDAR, self.OnCalSelected) c.Bind(wx.adv.EVT_CALENDAR, self.OnCalSelected)
## c.Bind(wx.adv.EVT_CALENDAR_MONTH, self.OnChangeMonth) c.Bind(wx.adv.EVT_CALENDAR_MONTH, self.OnChangeMonth)
c.Bind(wx.adv.EVT_CALENDAR_SEL_CHANGED, self.OnCalSelChanged) c.Bind(wx.adv.EVT_CALENDAR_SEL_CHANGED, self.OnCalSelChanged)
c.Bind(wx.adv.EVT_CALENDAR_WEEKDAY_CLICKED, self.OnCalWeekdayClicked) c.Bind(wx.adv.EVT_CALENDAR_WEEKDAY_CLICKED, self.OnCalWeekdayClicked)
@@ -53,15 +53,17 @@ class TestPanel(wx.Panel):
fgs = wx.FlexGridSizer(cols=2, hgap=50, vgap=50) fgs = wx.FlexGridSizer(cols=2, hgap=50, vgap=50)
fgs.Add(native) fgs.Add(native)
fgs.Add(txt) fgs.Add(txt)
# fgs.Add(cal) fgs.Add(cal)
# fgs.Add(cal2) fgs.Add(cal2)
box = wx.BoxSizer() box = wx.BoxSizer()
box.Add(fgs, 1, wx.EXPAND|wx.ALL, 25) box.Add(fgs, 1, wx.EXPAND|wx.ALL, 25)
self.SetSizer(box) self.SetSizer(box)
def OnCalSelected(self, evt): def OnCalSelected(self, evt):
self.log.write('OnCalSelected: %s\n' % evt.GetDate()) self.log.write('OnCalSelected: %s\n' % evt.Date)
if evt.Date.month == wx.DateTime.Aug and evt.Date.day == 14:
self.log.write("HAPPY BIRTHDAY!")
def OnCalWeekdayClicked(self, evt): def OnCalWeekdayClicked(self, evt):
self.log.write('OnCalWeekdayClicked: %s\n' % evt.GetWeekDay()) self.log.write('OnCalWeekdayClicked: %s\n' % evt.GetWeekDay())
@@ -86,7 +88,7 @@ class TestPanel(wx.Panel):
# August 14th is a special day, mark it with a blue square... # August 14th is a special day, mark it with a blue square...
if cur_month == 8: if cur_month == 8:
attr = wxcal.CalendarDateAttr(border=wx.adv.CAL_BORDER_SQUARE, attr = CalendarDateAttr(border=wx.adv.CAL_BORDER_SQUARE,
colBorder="blue") colBorder="blue")
cal.SetAttr(14, attr) cal.SetAttr(14, attr)
else: else: