From 0b8511474e5fec3cbee0c4bd89f764d2a7458281 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 26 Jun 2016 13:43:18 +0100 Subject: [PATCH] Added events for selecting a calendar event in the XCCalendarDayEntry class --- source/widgets/XCCalendarDayEntry.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/widgets/XCCalendarDayEntry.cpp b/source/widgets/XCCalendarDayEntry.cpp index f5f31b4..4eb9baf 100644 --- a/source/widgets/XCCalendarDayEntry.cpp +++ b/source/widgets/XCCalendarDayEntry.cpp @@ -27,10 +27,7 @@ END_EVENT_TABLE() using namespace std; XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, const int id) - : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title) -{ - - Connect(wxID_ANY, XCCALENDARDAYENTRY_DESELECT, wxCommandEventHandler(XCCalendarDayEntry::Deselect)); + : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title){ DayPanel = parent->GetParent(); EntryID = id; @@ -45,6 +42,11 @@ XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title, AlarmIcon->SetBitmap(AlarmIconBitmap); HighPriorityIcon->SetBitmap(PriorityIconBitmap); + + Connect(wxID_ANY, XCCALENDARDAYENTRY_DESELECT, wxCommandEventHandler(XCCalendarDayEntry::Deselect)); + AlarmIcon->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); + HighPriorityIcon->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); + EventText->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); UpdateInformation(); @@ -144,15 +146,13 @@ void XCCalendarDayEntry::UpdateInformation(){ } -void XCCalendarDayEntry::PaintFrameEvent(wxPaintEvent &PaintEvent) -{ +void XCCalendarDayEntry::PaintFrameEvent(wxPaintEvent &PaintEvent){ Repaint(); } -void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent) -{ +void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent){ // Adjust the Event text so it is displayed properly. @@ -174,8 +174,7 @@ void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent) } -void XCCalendarDayEntry::LeftClick(wxMouseEvent &MouseEvent) -{ +void XCCalendarDayEntry::LeftClick(wxMouseEvent &MouseEvent){ // Change the background of the widget to mark // the entry as selected. -- 2.39.2