+wxDEFINE_EVENT(XCCALENDARMONTH_DESELECTOTHERENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_HIDEACCOUNTENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_SHOWACCOUNTENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_HIDECALENDARENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_SHOWCALENDARENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_DELETECALENDARENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_DISPLAYEVENTMENU, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_DELETEENTRY, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_ADDENTRY, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_UPDATEENTRY, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARMONTH_UPDATECALENDARCOLOUR, wxCommandEvent);
+
END_EVENT_TABLE()
XCCalendarMonthView::XCCalendarMonthView(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector<int> *hideAccounts, std::vector<int> *hideCalendars)
: wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL){
END_EVENT_TABLE()
XCCalendarMonthView::XCCalendarMonthView(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector<int> *hideAccounts, std::vector<int> *hideCalendars)
: wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL){
- MondayText = new XCCalendarMonthViewDayTitle(this, _("Monday"), wxDefaultPosition, wxDefaultSize);
- TuesdayText = new XCCalendarMonthViewDayTitle(this, _("Tuesday"), wxDefaultPosition, wxDefaultSize);
- WednesdayText = new XCCalendarMonthViewDayTitle(this, _("Wednesday"), wxDefaultPosition, wxDefaultSize);
- ThursdayText = new XCCalendarMonthViewDayTitle(this, _("Thursday"), wxDefaultPosition, wxDefaultSize);
- FridayText = new XCCalendarMonthViewDayTitle(this, _("Friday"), wxDefaultPosition, wxDefaultSize);
- SaturdayText = new XCCalendarMonthViewDayTitle(this, _("Saturday"), wxDefaultPosition, wxDefaultSize);
- SundayText = new XCCalendarMonthViewDayTitle(this, _("Sunday"), wxDefaultPosition, wxDefaultSize);
+ mondayText = new XCCalendarMonthViewDayTitle(this, _("Monday"), wxDefaultPosition, wxDefaultSize);
+ tuesdayText = new XCCalendarMonthViewDayTitle(this, _("Tuesday"), wxDefaultPosition, wxDefaultSize);
+ wednesdayText = new XCCalendarMonthViewDayTitle(this, _("Wednesday"), wxDefaultPosition, wxDefaultSize);
+ thursdayText = new XCCalendarMonthViewDayTitle(this, _("Thursday"), wxDefaultPosition, wxDefaultSize);
+ fridayText = new XCCalendarMonthViewDayTitle(this, _("Friday"), wxDefaultPosition, wxDefaultSize);
+ saturdayText = new XCCalendarMonthViewDayTitle(this, _("Saturday"), wxDefaultPosition, wxDefaultSize);
+ sundayText = new XCCalendarMonthViewDayTitle(this, _("Sunday"), wxDefaultPosition, wxDefaultSize);
- WindowSizer->Add(MondayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(TuesdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(WednesdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(ThursdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(FridayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(SaturdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(SundayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(mondayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(tuesdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(wednesdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(thursdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(fridayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(saturdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(sundayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->AddGrowableCol(0);
- WindowSizer->AddGrowableCol(1);
- WindowSizer->AddGrowableCol(2);
- WindowSizer->AddGrowableCol(3);
- WindowSizer->AddGrowableCol(4);
- WindowSizer->AddGrowableCol(5);
- WindowSizer->AddGrowableCol(6);
- WindowSizer->SetFlexibleDirection( wxBOTH );
- WindowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
- this->SetSizer(WindowSizer);
- WindowSizer->Fit(this);
+ windowSizer->AddGrowableCol(0);
+ windowSizer->AddGrowableCol(1);
+ windowSizer->AddGrowableCol(2);
+ windowSizer->AddGrowableCol(3);
+ windowSizer->AddGrowableCol(4);
+ windowSizer->AddGrowableCol(5);
+ windowSizer->AddGrowableCol(6);
+ windowSizer->SetFlexibleDirection( wxBOTH );
+ windowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+ this->SetSizer(windowSizer);
+ windowSizer->Fit(this);
- Connect(ID_MONTHVIEWCLEARSELECTION, XCCALENDARMONTH_DESELECTOTHERENTRIES, wxCommandEventHandler(XCCalendarMonthView::DeselectOthersEvent));
- Connect(ID_HIDEENTRIES, XCCALENDARMONTH_HIDEACCOUNTENTRIES, wxCommandEventHandler(XCCalendarMonthView::HideAccountEntries));
- Connect(ID_SHOWENTRIES, XCCALENDARMONTH_SHOWACCOUNTENTRIES, wxCommandEventHandler(XCCalendarMonthView::ShowAccountEntries));
- Connect(ID_HIDECALENDARENTRIES, XCCALENDARMONTH_HIDECALENDARENTRIES, wxCommandEventHandler(XCCalendarMonthView::HideCalendarEntries));
- Connect(ID_SHOWCALENDARENTRIES, XCCALENDARMONTH_SHOWCALENDARENTRIES, wxCommandEventHandler(XCCalendarMonthView::ShowCalendarEntries));
- Connect(ID_DELETECALENDARENTRIES, XCCALENDARMONTH_DELETECALENDARENTRIES, wxCommandEventHandler(XCCalendarMonthView::DeleteCalendarEntries));
- Connect(ID_DISPLAYEVENTMENU, XCCALENDARMONTH_DISPLAYEVENTMENU, wxCommandEventHandler(XCCalendarMonthView::ShowEventMenu));
- Connect(ID_DELETEENTRY, XCCALENDARMONTH_DELETEENTRY, wxCommandEventHandler(XCCalendarMonthView::DeleteCalendarEntry));
- Connect(ID_ADDENTRY, XCCALENDARMONTH_ADDENTRY, wxCommandEventHandler(XCCalendarMonthView::AddCalendarEntry));
- Connect(ID_UPDATEENTRY, XCCALENDARMONTH_UPDATEENTRY, wxCommandEventHandler(XCCalendarMonthView::UpdateCalendarEntry));
- Connect(ID_UPDATECOLOUR, XCCALENDARMONTH_UPDATECALENDARCOLOUR, wxCommandEventHandler(XCCalendarMonthView::UpdateCalendarColour));
+ // Bind events to the control.
+ Bind(XCCALENDARMONTH_DESELECTOTHERENTRIES, &XCCalendarMonthView::DeselectOthersEvent, this, ID_MONTHVIEWCLEARSELECTION);
+ Bind(XCCALENDARMONTH_HIDEACCOUNTENTRIES, &XCCalendarMonthView::HideAccountEntries, this, ID_HIDEENTRIES);
+ Bind(XCCALENDARMONTH_SHOWACCOUNTENTRIES, &XCCalendarMonthView::ShowAccountEntries, this, ID_SHOWENTRIES);
+ Bind(XCCALENDARMONTH_HIDECALENDARENTRIES, &XCCalendarMonthView::HideCalendarEntries, this, ID_HIDECALENDARENTRIES);
+ Bind(XCCALENDARMONTH_SHOWCALENDARENTRIES, &XCCalendarMonthView::ShowCalendarEntries, this, ID_SHOWCALENDARENTRIES);
+ Bind(XCCALENDARMONTH_DELETECALENDARENTRIES, &XCCalendarMonthView::DeleteCalendarEntries, this, ID_DELETECALENDARENTRIES);
+ Bind(XCCALENDARMONTH_DISPLAYEVENTMENU, &XCCalendarMonthView::ShowEventMenu, this, ID_DISPLAYEVENTMENU);
+ Bind(XCCALENDARMONTH_DELETEENTRY, &XCCalendarMonthView::DeleteCalendarEntry, this, ID_DELETEENTRY);
+ Bind(XCCALENDARMONTH_ADDENTRY, &XCCalendarMonthView::AddCalendarEntry, this, ID_ADDENTRY);
+ Bind(XCCALENDARMONTH_UPDATEENTRY, &XCCalendarMonthView::UpdateCalendarEntry, this, ID_UPDATEENTRY);
+ Bind(XCCALENDARMONTH_UPDATECALENDARCOLOUR, &XCCalendarMonthView::UpdateCalendarColour, this, ID_UPDATECOLOUR);
- MondayText = new XCCalendarMonthViewDayTitle(this, _("Monday"), wxDefaultPosition, wxDefaultSize);
- TuesdayText = new XCCalendarMonthViewDayTitle(this, _("Tuesday"), wxDefaultPosition, wxDefaultSize);
- WednesdayText = new XCCalendarMonthViewDayTitle(this, _("Wednesday"), wxDefaultPosition, wxDefaultSize);
- ThursdayText = new XCCalendarMonthViewDayTitle(this, _("Thursday"), wxDefaultPosition, wxDefaultSize);
- FridayText = new XCCalendarMonthViewDayTitle(this, _("Friday"), wxDefaultPosition, wxDefaultSize);
- SaturdayText = new XCCalendarMonthViewDayTitle(this, _("Saturday"), wxDefaultPosition, wxDefaultSize);
- SundayText = new XCCalendarMonthViewDayTitle(this, _("Sunday"), wxDefaultPosition, wxDefaultSize);
-
- WindowSizer->Add(MondayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(TuesdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(WednesdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(ThursdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(FridayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(SaturdayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->Add(SundayText, 1, wxEXPAND|wxALL, 0);
+ mondayText = new XCCalendarMonthViewDayTitle(this, _("Monday"), wxDefaultPosition, wxDefaultSize);
+ tuesdayText = new XCCalendarMonthViewDayTitle(this, _("Tuesday"), wxDefaultPosition, wxDefaultSize);
+ wednesdayText = new XCCalendarMonthViewDayTitle(this, _("Wednesday"), wxDefaultPosition, wxDefaultSize);
+ thursdayText = new XCCalendarMonthViewDayTitle(this, _("Thursday"), wxDefaultPosition, wxDefaultSize);
+ fridayText = new XCCalendarMonthViewDayTitle(this, _("Friday"), wxDefaultPosition, wxDefaultSize);
+ saturdayText = new XCCalendarMonthViewDayTitle(this, _("Saturday"), wxDefaultPosition, wxDefaultSize);
+ sundayText = new XCCalendarMonthViewDayTitle(this, _("Sunday"), wxDefaultPosition, wxDefaultSize);
+
+ windowSizer->Add(mondayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(tuesdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(wednesdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(thursdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(fridayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(saturdayText, 1, wxEXPAND|wxALL, 0);
+ windowSizer->Add(sundayText, 1, wxEXPAND|wxALL, 0);
- WindowSizer->AddGrowableCol(0);
- WindowSizer->AddGrowableCol(1);
- WindowSizer->AddGrowableCol(2);
- WindowSizer->AddGrowableCol(3);
- WindowSizer->AddGrowableCol(4);
- WindowSizer->AddGrowableCol(5);
- WindowSizer->AddGrowableCol(6);
- WindowSizer->SetFlexibleDirection( wxBOTH );
- WindowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
- this->SetSizer(WindowSizer);
- WindowSizer->Fit(this);
+ windowSizer->AddGrowableCol(0);
+ windowSizer->AddGrowableCol(1);
+ windowSizer->AddGrowableCol(2);
+ windowSizer->AddGrowableCol(3);
+ windowSizer->AddGrowableCol(4);
+ windowSizer->AddGrowableCol(5);
+ windowSizer->AddGrowableCol(6);
+ windowSizer->SetFlexibleDirection( wxBOTH );
+ windowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+ this->SetSizer(windowSizer);
+ windowSizer->Fit(this);
- for (vector<XCCalendarDay*>::iterator DayIter = CalendarDayList.begin();
- DayIter != CalendarDayList.end(); DayIter++){
+ for (vector<XCCalendarDay*>::iterator dayIter = calendarDayList.begin();
+ dayIter != calendarDayList.end(); dayIter++){
+
+ wxCommandEvent addEvent(XCCALENDARDAY_DELETEENTRY);
+ addEvent.SetId(ID_DELETEENTRY);
+ addEvent.SetInt(eventInfo->eventID);
+ wxPostEvent((*dayIter), addEvent);
+
+ }
+
+ for (vector<XCCalendarDay*>::iterator dayIter = calendarDayList.begin();
+ dayIter != calendarDayList.end(); dayIter++){