X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarMonthView.cpp;h=941a484c4450c5f440006133a52dc8a8b30cb0e3;hp=bd297587f86081a9e5b6af55bcc7bc33c1763eda;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=c5716d0f27f0f917282df9121aa97eab7a1bf6b8 diff --git a/source/widgets/XCCalendarMonthView.cpp b/source/widgets/XCCalendarMonthView.cpp index bd29758..941a484 100644 --- a/source/widgets/XCCalendarMonthView.cpp +++ b/source/widgets/XCCalendarMonthView.cpp @@ -20,32 +20,42 @@ using namespace std; +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); + BEGIN_EVENT_TABLE(XCCalendarMonthView, wxPanel) -EVT_PAINT(XCCalendarMonthView::PaintFrameEvent) END_EVENT_TABLE() XCCalendarMonthView::XCCalendarMonthView(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector *hideAccounts, std::vector *hideCalendars) : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL){ - calendarStorage = dataStorage; - 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); eventMenu = new XCEventMenu; - 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); ProcessGrid(grid, hideAccounts, hideCalendars); @@ -53,84 +63,74 @@ XCCalendarMonthView::XCCalendarMonthView(wxWindow *parent, const wxString& title // Setup the growable rows and columns. - 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); this->Layout(); this->SetBackgroundColour(wxColour(0,0,0)); - 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); + } -XCCalendarMonthView::XCCalendarMonthView(XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector *hideAccounts, std::vector *hideCalendars) - : wxPanel(NULL, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL){ - - Connect(ID_MONTHVIEWCLEARSELECTION, XCCALENDARMONTH_DESELECTOTHERENTRIES, wxCommandEventHandler(XCCalendarMonthView::DeselectOthersEvent)); - - calendarStorage = dataStorage; - - 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); +XCCalendarMonthView::~XCCalendarMonthView(){ - ProcessGrid(grid, hideAccounts, hideCalendars); + delete mondayText; + delete tuesdayText; + delete wednesdayText; + delete thursdayText; + delete fridayText; + delete saturdayText; + delete sundayText; - // Setup the days. + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ + + delete ((*dayIter)); + + } - // Setup the growable rows and columns. + delete eventMenu; + this->SetSizer(nullptr, true); - 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); - this->Layout(); - this->SetBackgroundColour(wxColour(0,0,0)); + // Unbind events from control -} - -XCCalendarMonthView::~XCCalendarMonthView(){ + Unbind(XCCALENDARMONTH_DESELECTOTHERENTRIES, &XCCalendarMonthView::DeselectOthersEvent, this); + Unbind(XCCALENDARMONTH_HIDEACCOUNTENTRIES, &XCCalendarMonthView::HideAccountEntries, this); + Unbind(XCCALENDARMONTH_SHOWACCOUNTENTRIES, &XCCalendarMonthView::ShowAccountEntries, this); + Unbind(XCCALENDARMONTH_HIDECALENDARENTRIES, &XCCalendarMonthView::HideCalendarEntries, this); + Unbind(XCCALENDARMONTH_SHOWCALENDARENTRIES, &XCCalendarMonthView::ShowCalendarEntries, this); + Unbind(XCCALENDARMONTH_DELETECALENDARENTRIES, &XCCalendarMonthView::DeleteCalendarEntries, this); + Unbind(XCCALENDARMONTH_DISPLAYEVENTMENU, &XCCalendarMonthView::ShowEventMenu, this); + Unbind(XCCALENDARMONTH_DELETEENTRY, &XCCalendarMonthView::DeleteCalendarEntry, this); + Unbind(XCCALENDARMONTH_ADDENTRY, &XCCalendarMonthView::AddCalendarEntry, this); + Unbind(XCCALENDARMONTH_UPDATEENTRY, &XCCalendarMonthView::UpdateCalendarEntry, this); + Unbind(XCCALENDARMONTH_UPDATECALENDARCOLOUR, &XCCalendarMonthView::UpdateCalendarColour, this); + // Don't delete CalendarDataStorage object (used elsewhere). + calendarStorage = nullptr; } @@ -140,26 +140,26 @@ void XCCalendarMonthView::ProcessGrid(XCCalendarMonthViewGrid *grid, std::vector // Add the new calendar entries. - int Week = 0; + int week = 0; - for (vector::iterator WeekIter = grid->WeekList.begin(); - WeekIter != grid->WeekList.end(); WeekIter++){ + for (vector::iterator weekIter = grid->weekList.begin(); + weekIter != grid->weekList.end(); weekIter++){ - Week++; + week++; - for (vector::iterator DayIter = (*WeekIter).DayList.begin(); - DayIter != (*WeekIter).DayList.end(); DayIter++){ + for (vector::iterator dayIter = (*weekIter).dayList.begin(); + dayIter != (*weekIter).dayList.end(); dayIter++){ - // TODO: Add CalendarEntries. - - XCCalendarDay *CalendarDayItem = new XCCalendarDay(this, "XCCalendarMonthView Test", wxPoint(50, 50), wxSize(200, 200)); + // Add Calendar entries. + XCCalendarDay *calendarDayItem = new XCCalendarDay(this, "XCCalendarMonthView Test", wxPoint(50, 50), wxSize(100,100)); + // Setup the control. - CalendarDayItem->SetupControl((*DayIter).Day, (*DayIter).Month, (*DayIter).Year, (*DayIter).IsInMonth, this, calendarStorage, hideAccounts, hideCalendars); + calendarDayItem->SetupControl((*dayIter).day, (*dayIter).month, (*dayIter).year, (*dayIter).isInMonth, this, calendarStorage, hideAccounts, hideCalendars); - CalendarDayList.push_back(CalendarDayItem); - WindowSizer->Add(CalendarDayItem, 1, wxEXPAND, 5); + calendarDayList.push_back(calendarDayItem); + windowSizer->Add(calendarDayItem, 1, wxEXPAND, 5); } @@ -167,28 +167,14 @@ void XCCalendarMonthView::ProcessGrid(XCCalendarMonthViewGrid *grid, std::vector // Add the Growable Rows. - for (int WeekSeek = 0; WeekSeek < Week; WeekSeek++){ + for (int weekSeek = 0; weekSeek < week; weekSeek++){ - WindowSizer->AddGrowableRow((WeekSeek + 1)); + windowSizer->AddGrowableRow((weekSeek + 1)); } } -void XCCalendarMonthView::Repaint(){ - - // Draw the border. - - this->Layout(); - -} - -void XCCalendarMonthView::PaintFrameEvent(wxPaintEvent &PaintEvent){ - - Repaint(); - -} - void XCCalendarMonthView::ResizeFrameEvent(wxSizeEvent &SizeEvent){ // TODO: Check if window size is less than 120 pixels and if it is, @@ -200,16 +186,16 @@ void XCCalendarMonthView::ResizeFrameEvent(wxSizeEvent &SizeEvent){ } -void XCCalendarMonthView::DeselectOthersEvent(wxCommandEvent &DeselectEvent){ +void XCCalendarMonthView::DeselectOthersEvent(wxCommandEvent &deselectEvent){ - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ - if (DeselectEvent.GetClientData() != (void*)(*DayIter)){ + if (deselectEvent.GetClientData() != (void*)(*dayIter)){ - wxCommandEvent DeselectEvent(XCCALENDARDAY_DESELECTALLENTRIES); - DeselectEvent.SetId(ID_DESELECTALLITEMS); - wxPostEvent((*DayIter), DeselectEvent); + wxCommandEvent deselectEvent(XCCALENDARDAY_DESELECTALLENTRIES); + deselectEvent.SetId(ID_DESELECTALLITEMS); + wxPostEvent((*dayIter), deselectEvent); } @@ -219,13 +205,13 @@ void XCCalendarMonthView::DeselectOthersEvent(wxCommandEvent &DeselectEvent){ void XCCalendarMonthView::HideAccountEntries(wxCommandEvent &accountData){ - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ - wxCommandEvent HideEvent(XCCALENDARDAY_HIDEACCOUNTENTRIES); - HideEvent.SetInt(accountData.GetInt()); - HideEvent.SetId(ID_HIDEENTRIES); - wxPostEvent((*DayIter), HideEvent); + wxCommandEvent hideEvent(XCCALENDARDAY_HIDEACCOUNTENTRIES); + hideEvent.SetInt(accountData.GetInt()); + hideEvent.SetId(ID_HIDEENTRIES); + wxPostEvent((*dayIter), hideEvent); } @@ -233,13 +219,13 @@ void XCCalendarMonthView::HideAccountEntries(wxCommandEvent &accountData){ void XCCalendarMonthView::ShowAccountEntries(wxCommandEvent &accountData){ - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ - wxCommandEvent ShowEvent(XCCALENDARDAY_SHOWACCOUNTENTRIES); - ShowEvent.SetInt(accountData.GetInt()); - ShowEvent.SetId(ID_SHOWENTRIES); - wxPostEvent((*DayIter), ShowEvent); + wxCommandEvent showEvent(XCCALENDARDAY_SHOWACCOUNTENTRIES); + showEvent.SetInt(accountData.GetInt()); + showEvent.SetId(ID_SHOWENTRIES); + wxPostEvent((*dayIter), showEvent); } @@ -247,13 +233,13 @@ void XCCalendarMonthView::ShowAccountEntries(wxCommandEvent &accountData){ void XCCalendarMonthView::HideCalendarEntries(wxCommandEvent &accountData){ - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ - wxCommandEvent HideEvent(XCCALENDARDAY_HIDECALENDARENTRIES); - HideEvent.SetInt(accountData.GetInt()); - HideEvent.SetId(ID_HIDECALENDARENTRIES); - wxPostEvent((*DayIter), HideEvent); + wxCommandEvent hideEvent(XCCALENDARDAY_HIDECALENDARENTRIES); + hideEvent.SetInt(accountData.GetInt()); + hideEvent.SetId(ID_HIDECALENDARENTRIES); + wxPostEvent((*dayIter), hideEvent); } @@ -261,13 +247,13 @@ void XCCalendarMonthView::HideCalendarEntries(wxCommandEvent &accountData){ void XCCalendarMonthView::ShowCalendarEntries(wxCommandEvent &accountData){ - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ - wxCommandEvent HideEvent(XCCALENDARDAY_SHOWCALENDARENTRIES); - HideEvent.SetInt(accountData.GetInt()); - HideEvent.SetId(ID_SHOWCALENDARENTRIES); - wxPostEvent((*DayIter), HideEvent); + wxCommandEvent hideEvent(XCCALENDARDAY_SHOWCALENDARENTRIES); + hideEvent.SetInt(accountData.GetInt()); + hideEvent.SetId(ID_SHOWCALENDARENTRIES); + wxPostEvent((*dayIter), hideEvent); } @@ -275,13 +261,13 @@ void XCCalendarMonthView::ShowCalendarEntries(wxCommandEvent &accountData){ void XCCalendarMonthView::DeleteCalendarEntries(wxCommandEvent &calendarData){ - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ wxCommandEvent deleteEvent(XCCALENDARDAY_DELETECALENDARENTRIES); deleteEvent.SetInt(calendarData.GetInt()); deleteEvent.SetId(ID_DELETECALENDARENTRIES); - wxPostEvent((*DayIter), deleteEvent); + wxPostEvent((*dayIter), deleteEvent); } @@ -289,13 +275,13 @@ void XCCalendarMonthView::DeleteCalendarEntries(wxCommandEvent &calendarData){ void XCCalendarMonthView::DeleteCalendarEntry(wxCommandEvent &eventData){ - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ wxCommandEvent deleteEvent(XCCALENDARDAY_DELETEENTRY); deleteEvent.SetInt(eventData.GetInt()); deleteEvent.SetId(ID_DELETEENTRY); - wxPostEvent((*DayIter), deleteEvent); + wxPostEvent((*dayIter), deleteEvent); } @@ -306,20 +292,20 @@ void XCCalendarMonthView::AddCalendarEntry(wxCommandEvent &eventData){ EventProperties *eventInfo = (EventProperties*)eventData.GetClientData(); bool foundDate = false; - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ // Check if the date matches with the date in the day // widget. If it does, add the widget. - if ((*DayIter)->GetCalendarYear() == eventInfo->eventYear && - (*DayIter)->GetCalendarMonth() == (eventInfo->eventMonth + 1) && - (*DayIter)->GetCalendarDay() == eventInfo->eventDay){ + if ((*dayIter)->GetCalendarYear() == eventInfo->eventYear && + (*dayIter)->GetCalendarMonth() == (eventInfo->eventMonth + 1) && + (*dayIter)->GetCalendarDay() == eventInfo->eventDay){ wxCommandEvent addEvent(XCCALENDARDAY_ADDENTRY); addEvent.SetId(ID_ADDENTRY); addEvent.SetClientData(eventInfo); - wxPostEvent((*DayIter), addEvent); + wxPostEvent((*dayIter), addEvent); foundDate = true; break; @@ -341,20 +327,30 @@ void XCCalendarMonthView::UpdateCalendarEntry(wxCommandEvent &eventData){ EventProperties *eventInfo = (EventProperties*)eventData.GetClientData(); bool foundDate = false; - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::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::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ // Check if the date matches with the date in the day // widget. If it does, update the widget. - if ((*DayIter)->GetCalendarYear() == eventInfo->eventYear && - (*DayIter)->GetCalendarMonth() == (eventInfo->eventMonth + 1) && - (*DayIter)->GetCalendarDay() == eventInfo->eventDay){ + if ((*dayIter)->GetCalendarYear() == eventInfo->eventYear && + (*dayIter)->GetCalendarMonth() == (eventInfo->eventMonth + 1) && + (*dayIter)->GetCalendarDay() == eventInfo->eventDay){ - wxCommandEvent addEvent(XCCALENDARDAY_UPDATEENTRY); - addEvent.SetId(ID_UPDATEENTRY); + wxCommandEvent addEvent(XCCALENDARDAY_ADDENTRY); + addEvent.SetId(ID_ADDENTRY); addEvent.SetClientData(eventInfo); - wxPostEvent((*DayIter), addEvent); + wxPostEvent((*dayIter), addEvent); foundDate = true; break; @@ -375,8 +371,8 @@ void XCCalendarMonthView::UpdateCalendarColour(wxCommandEvent &colourData){ ColourUpdateProperties *colourDataInfo = (ColourUpdateProperties*)colourData.GetClientData(); - for (vector::iterator DayIter = CalendarDayList.begin(); - DayIter != CalendarDayList.end(); DayIter++){ + for (vector::iterator dayIter = calendarDayList.begin(); + dayIter != calendarDayList.end(); dayIter++){ // Check if the date matches with the date in the day // widget. If it does, update the widget. @@ -386,7 +382,7 @@ void XCCalendarMonthView::UpdateCalendarColour(wxCommandEvent &colourData){ wxCommandEvent updateColour(XCCALENDARDAY_UPDATECALENDARCOLOUR); updateColour.SetId(ID_UPDATECOLOUR); updateColour.SetClientData(colourDataPassInfo); - wxPostEvent((*DayIter), updateColour); + wxPostEvent((*dayIter), updateColour); }