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

Merge pull request #878 from RobinD42/fix-issue875

Browse Source 
Add missing wx.adv.EVT_CALENDAR_WEEK_CLICKED
(cherry picked from commit e1732ee271)
This commit is contained in:
Robin Dunn
2018-06-04 21:47:45 -07:00
parent 5d011f4f04
commit 9dd05ae311
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.rst
View File

@@ -160,6 +160,8 @@ Changes in this release include the following:
* Fixed all implementations of the PGProperty.StringToValue and IntToValue * Fixed all implementations of the PGProperty.StringToValue and IntToValue
methods to treat the value parameter as a return value. (#742) methods to treat the value parameter as a return value. (#742)
* Add missing wx.adv.EVT_CALENDAR_WEEK_CLICKED (#875)

2
docs/sphinx/itemToModuleMap.json
View File

@@ -816,7 +816,7 @@
"DirProperty":"wx.propgrid.", "DirProperty":"wx.propgrid.",
"DirSelector":"wx.", "DirSelector":"wx.",
"DirSelectorPromptStr":"wx.", "DirSelectorPromptStr":"wx.",
"Direction":"wx.DataObject.", "Direction":"wx.",
"DisableAsserts":"wx.", "DisableAsserts":"wx.",
"Display":"wx.", "Display":"wx.",
"DisplayChangedEvent":"wx.", "DisplayChangedEvent":"wx.",

3
etg/calctrl.py
View File

@@ -43,10 +43,11 @@ def run():
EVT_CALENDAR_SEL_CHANGED = wx.PyEventBinder( wxEVT_CALENDAR_SEL_CHANGED, 1) EVT_CALENDAR_SEL_CHANGED = wx.PyEventBinder( wxEVT_CALENDAR_SEL_CHANGED, 1)
EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1) EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
EVT_CALENDAR_PAGE_CHANGED = wx.PyEventBinder( wxEVT_CALENDAR_PAGE_CHANGED, 1) EVT_CALENDAR_PAGE_CHANGED = wx.PyEventBinder( wxEVT_CALENDAR_PAGE_CHANGED, 1)
EVT_CALENDAR_WEEK_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEK_CLICKED, 1)
""") """)
# These are deprecated, get rid of them later...
module.addPyCode("""\ module.addPyCode("""\
# These are deprecated, will be removed later...
EVT_CALENDAR_DAY = wx.PyEventBinder( wxEVT_CALENDAR_DAY_CHANGED, 1) EVT_CALENDAR_DAY = wx.PyEventBinder( wxEVT_CALENDAR_DAY_CHANGED, 1)
EVT_CALENDAR_MONTH = wx.PyEventBinder( wxEVT_CALENDAR_MONTH_CHANGED, 1) EVT_CALENDAR_MONTH = wx.PyEventBinder( wxEVT_CALENDAR_MONTH_CHANGED, 1)
EVT_CALENDAR_YEAR = wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1) EVT_CALENDAR_YEAR = wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1)

16
unittests/test_calctrl.py
View File

@@ -66,13 +66,27 @@ class calctrl_Tests(wtc.WidgetTestCase):
def test_calevt(self): def test_calevt1(self):
evt = wx.adv.CalendarEvent() evt = wx.adv.CalendarEvent()
evt.SetDate(wx.DateTime.Today()) evt.SetDate(wx.DateTime.Today())
d = evt.PyGetDate() d = evt.PyGetDate()
assert isinstance(d, datetime.datetime) assert isinstance(d, datetime.datetime)
def test_calevt2(self):
wx.adv.EVT_CALENDAR
wx.adv.EVT_CALENDAR_SEL_CHANGED
wx.adv.EVT_CALENDAR_WEEKDAY_CLICKED
wx.adv.EVT_CALENDAR_PAGE_CHANGED
wx.adv.EVT_CALENDAR_WEEK_CLICKED
wx.adv.wxEVT_CALENDAR_SEL_CHANGED
wx.adv.wxEVT_CALENDAR_PAGE_CHANGED
wx.adv.wxEVT_CALENDAR_DOUBLECLICKED
wx.adv.wxEVT_CALENDAR_WEEKDAY_CLICKED
wx.adv.wxEVT_CALENDAR_WEEK_CLICKED
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
if __name__ == '__main__': if __name__ == '__main__':