X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDay.cpp;h=110d32118f94bea1462e283f82627406fceac5e1;hp=14657b98cc307b0260f995129b143015a3de6d01;hb=401fd2eee6047f72fdaf811bbcc3924409a4fb9d;hpb=6028a1fc2134c5d1fe9c0147381cf81c4a0ef126 diff --git a/source/widgets/XCCalendarDay.cpp b/source/widgets/XCCalendarDay.cpp index 14657b9..110d321 100644 --- a/source/widgets/XCCalendarDay.cpp +++ b/source/widgets/XCCalendarDay.cpp @@ -41,43 +41,43 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo wxImage icons_priority_png(priorityicon, wxBITMAP_TYPE_PNG); wxBitmap imgPriorityIcon(icons_priority_png, -1); - AlertIcon->SetBitmap(imgAlertIcon); - HighPriorityIcon->SetBitmap(imgPriorityIcon); + alertIcon->SetBitmap(imgAlertIcon); + highPriorityIcon->SetBitmap(imgPriorityIcon); - WindowSizer->AddGrowableCol(0); - WindowSizer->AddGrowableRow(1); - WindowSizer->SetFlexibleDirection( wxBOTH ); - WindowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + windowSizer->AddGrowableCol(0); + windowSizer->AddGrowableRow(1); + windowSizer->SetFlexibleDirection( wxBOTH ); + windowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - NumberText = new wxStaticText(this, wxID_ANY, wxT("09"), wxDefaultPosition, wxDefaultSize, 0); - NumberText->SetFont(wxFont(24, 70, 90, 92, false, wxEmptyString)); + numberText = new wxStaticText(this, wxID_ANY, wxT("09"), wxDefaultPosition, wxDefaultSize, 0); + numberText->SetFont(wxFont(24, 70, 90, 92, false, wxEmptyString)); - TopSectionSizer->Add(HighPriorityIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); - TopSectionSizer->Add(AlertIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); - TopSectionSizer->Add(0, 0, 1, wxEXPAND, 5); - TopSectionSizer->Add(NumberText, 0, wxALL|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5); + topSectionSizer->Add(highPriorityIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); + topSectionSizer->Add(alertIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); + topSectionSizer->Add(0, 0, 1, wxEXPAND, 5); + topSectionSizer->Add(numberText, 0, wxALL|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5); // Setup the scrollable section. - Colour EventColour; - EventColour.red = 40; EventColour.green = 80; EventColour.blue = 80; + Colour eventColour; + eventColour.red = 40; eventColour.green = 80; eventColour.blue = 80; - EventListFrame->SetSizer(EventListFrameSizer); + eventListFrame->SetSizer(eventListFrameSizer); - EventListFrame->SetScrollRate(0,1); + eventListFrame->SetScrollRate(0,1); //EventListFrameSizer->FitInside(EventListFrame); - EventListFrameSizer->Fit(EventListFrame); - EventListFrameSizer->Layout(); - WindowSizer->Fit(this); + eventListFrameSizer->Fit(EventListFrame); + eventListFrameSizer->Layout(); + windowSizer->Fit(this); // Setup the scroll window. - MainSectionSizer->Add(EventListFrame, 1, wxGROW | wxALL, 10); + mainSectionSizer->Add(eventListFrame, 1, wxGROW | wxALL, 10); - WindowSizer->Add(TopSectionSizer, 1, wxEXPAND, 5); - WindowSizer->Add(MainSectionSizer, 1, wxEXPAND, 5); + windowSizer->Add(topSectionSizer, 1, wxEXPAND, 5); + windowSizer->Add(mainSectionSizer, 1, wxEXPAND, 5); - this->SetSizer(WindowSizer); + this->SetSizer(windowSizer); this->SetSize(size); this->Layout(); this->SetBackgroundStyle(wxBG_STYLE_PAINT); @@ -103,14 +103,14 @@ XCCalendarDay::~XCCalendarDay(){ // Destory the controls from the widget. - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - delete((*CalendarEntryIter)); + delete((*calendarEntryIter)); } - CalendarEntryList.clear(); + calendarEntryList.clear(); this->Refresh(); @@ -119,35 +119,35 @@ XCCalendarDay::~XCCalendarDay(){ void XCCalendarDay::Repaint(){ wxPaintDC dc(this); - wxPaintDC EventListFrameDC(EventListFrame); + wxPaintDC eventListFrameDC(eventListFrame); // Get the wxSizerItem for the top date and the entries part. - wxSizerItem *TopSectionSizerItem = WindowSizer->GetItem((size_t)0); - wxSizerItem *MainSectionSizerItem = WindowSizer->GetItem((size_t)1); - wxRect TopSizer = wxRect(WindowSizer->GetPosition(), WindowSizer->GetSize()); + wxSizerItem *topSectionSizerItem = windowSizer->GetItem((size_t)0); + wxSizerItem *mainSectionSizerItem = windowSizer->GetItem((size_t)1); + wxRect topSizer = wxRect(windowSizer->GetPosition(), windowSizer->GetSize()); - if (IsInMonth == true){ + if (isInMonth == true){ dc.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); dc.SetBrush(wxBrush(wxColor(255,255,255))); - dc.DrawRectangle(TopSectionSizerItem->GetRect()); + dc.DrawRectangle(topSectionSizerItem->GetRect()); dc.SetBrush(wxBrush(wxColor(225,225,225))); - dc.DrawRectangle(MainSectionSizerItem->GetRect()); - EventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); - EventListFrameDC.SetBrush(wxBrush(wxColor(225,225,225))); - EventListFrameDC.DrawRectangle(EventListFrame->GetClientRect()); + dc.DrawRectangle(mainSectionSizerItem->GetRect()); + eventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); + eventListFrameDC.SetBrush(wxBrush(wxColor(225,225,225))); + eventListFrameDC.DrawRectangle(eventListFrame->GetClientRect()); } else { dc.SetPen(wxPen(wxColor(185,185,185), 0, wxPENSTYLE_TRANSPARENT)); dc.SetBrush(wxBrush(wxColor(185,185,185))); - dc.DrawRectangle(TopSectionSizerItem->GetRect()); + dc.DrawRectangle(topSectionSizerItem->GetRect()); dc.SetBrush(wxBrush(wxColor(155,155,155))); - dc.DrawRectangle(MainSectionSizerItem->GetRect()); - EventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); - EventListFrameDC.SetBrush(wxBrush(wxColor(155,155,155))); - EventListFrameDC.DrawRectangle(EventListFrame->GetClientRect()); + dc.DrawRectangle(mainSectionSizerItem->GetRect()); + eventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); + eventListFrameDC.SetBrush(wxBrush(wxColor(155,155,155))); + eventListFrameDC.DrawRectangle(eventListFrame->GetClientRect()); } @@ -161,25 +161,25 @@ void XCCalendarDay::Repaint(){ void XCCalendarDay::UpdateTopIcons(){ - bool AlarmFound = false; - bool HighPriorityFound = false; + bool alarmFound = false; + bool highPriorityFound = false; - for (vector::iterator EntryIter = CalendarEntryList.begin(); - EntryIter != CalendarEntryList.end(); EntryIter++){ + for (vector::iterator entryIter = calendarEntryList.begin(); + entryIter != calendarEntryList.end(); entryIter++){ - if ((*EntryIter)->GetDisplayAlarm() == true){ + if ((*entryIter)->GetDisplayAlarm() == true){ - AlarmFound = true; + alarmFound = true; } - if ((*EntryIter)->GetDisplayHighPriority() == true){ + if ((*entryIter)->GetDisplayHighPriority() == true){ - HighPriorityFound = true; + highPriorityFound = true; } - if (AlarmFound == true && HighPriorityFound == true){ + if (alarmFound == true && highPriorityFound == true){ break; @@ -187,19 +187,19 @@ void XCCalendarDay::UpdateTopIcons(){ } - AlertIcon->Show(AlarmFound); - HighPriorityIcon->Show(HighPriorityFound); + alertIcon->Show(alarmFound); + highPriorityIcon->Show(highPriorityFound); } -void XCCalendarDay::PaintFrameEvent(wxPaintEvent &PaintEvent) +void XCCalendarDay::PaintFrameEvent(wxPaintEvent &paintEvent) { Repaint(); } -void XCCalendarDay::ResizeFrameEvent(wxSizeEvent &SizeEvent) +void XCCalendarDay::ResizeFrameEvent(wxSizeEvent &sizeEvent) { // TODO: Check if window size is less than 120 pixels and if it is, @@ -211,20 +211,20 @@ void XCCalendarDay::ResizeFrameEvent(wxSizeEvent &SizeEvent) } -void XCCalendarDay::DeselectOthersEvent(wxCommandEvent &DeselectEvent) +void XCCalendarDay::DeselectOthersEvent(wxCommandEvent &deselectEvent) { - int SelectedEntryID = DeselectEvent.GetInt(); + int selectedEntryID = deselectEvent.GetInt(); - wxCommandEvent DeselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); - DeselectEntryEvent.SetId(ID_ENTRYDESELECT); + wxCommandEvent deselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); + deselectEntryEvent.SetId(ID_ENTRYDESELECT); - for (vector::iterator EntryIter = CalendarEntryList.begin(); - EntryIter != CalendarEntryList.end(); EntryIter++){ + for (vector::iterator entryIter = calendarEntryList.begin(); + entryIter != calendarEntryList.end(); entryIter++){ - if ((*EntryIter)->GetID() != SelectedEntryID){ + if ((*entryIter)->GetID() != selectedEntryID){ - wxPostEvent((*EntryIter), DeselectEntryEvent); + wxPostEvent((*entryIter), deselectEntryEvent); } @@ -232,12 +232,12 @@ void XCCalendarDay::DeselectOthersEvent(wxCommandEvent &DeselectEvent) // Send event notification to deselect the other calendar entries. - if (this->MonthViewPointer != nullptr){ + if (this->monthViewPointer != nullptr){ - wxCommandEvent DeselectEvent(XCCALENDARMONTH_DESELECTOTHERENTRIES); - DeselectEvent.SetClientData(this); - DeselectEvent.SetId(ID_MONTHVIEWCLEARSELECTION); - wxPostEvent(this->MonthViewPointer, DeselectEvent); + wxCommandEvent deselectEvent(XCCALENDARMONTH_DESELECTOTHERENTRIES); + deselectEvent.SetClientData(this); + deselectEvent.SetId(ID_MONTHVIEWCLEARSELECTION); + wxPostEvent(this->monthViewPointer, deselectEvent); } @@ -246,49 +246,49 @@ void XCCalendarDay::DeselectOthersEvent(wxCommandEvent &DeselectEvent) void XCCalendarDay::DeselectAllEvent(wxCommandEvent &DeselectEvent) { - int SelectedEntryID = DeselectEvent.GetInt(); + int selectedEntryID = deselectEvent.GetInt(); - wxCommandEvent DeselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); - DeselectEntryEvent.SetId(ID_ENTRYDESELECT); + wxCommandEvent deselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); + deselectEntryEvent.SetId(ID_ENTRYDESELECT); - for (vector::iterator EntryIter = CalendarEntryList.begin(); - EntryIter != CalendarEntryList.end(); EntryIter++){ + for (vector::iterator entryIter = calendarEntryList.begin(); + entryIter != calendarEntryList.end(); EntryIter++){ - wxPostEvent((*EntryIter), DeselectEntryEvent); + wxPostEvent((*entryIter), deselectEntryEvent); } } -void XCCalendarDay::SetupControl(int SetupDay, int SetupMonth, int SetupYear, bool SetupIsInMonth, XCCalendarMonthView *MonthViewPointer, CalendarDataStorage *dataStorage, vector *hideAccounts, vector *hideCalendars) +void XCCalendarDay::SetupControl(int setupDay, int setupMonth, int setupYear, bool setupIsInMonth, XCCalendarMonthView *monthViewPointer, CalendarDataStorage *dataStorage, vector *hideAccounts, vector *hideCalendars) { this->dataStorage = dataStorage; // Set the day - NumberText->SetLabel(wxString::Format("%02i", SetupDay)); - calendarDay = SetupDay; + numberText->SetLabel(wxString::Format("%02i", setupDay)); + calendarDay = setupDay; // Set the month - calendarMonth = SetupMonth; + calendarMonth = setupMonth; // Set the year. - calendarYear = SetupYear; + calendarYear = setupYear; // Setup the Is In Month value. - IsInMonth = SetupIsInMonth; + isInMonth = setupIsInMonth; // Setup the month view pointer. - this->MonthViewPointer = MonthViewPointer; + this->monthViewPointer = monthViewPointer; // Setup the calendar items. - CDSEntryList calendarItems = dataStorage->GetEventListByDate(SetupYear, SetupMonth, SetupDay); + CDSEntryList calendarItems = dataStorage->GetEventListByDate(setupYear, setupMonth, setupDay); for (int entrySeek = 0; entrySeek < calendarItems.entryList.size(); entrySeek++){ @@ -299,14 +299,14 @@ void XCCalendarDay::SetupControl(int SetupDay, int SetupMonth, int SetupYear, bo // Setup the calendar entry. - XCCalendarDayEntry *newEntry = new XCCalendarDayEntry(EventListFrame, newEntryInfo.entryName, wxDefaultPosition, wxDefaultSize, calendarItems.entryList[entrySeek]); + XCCalendarDayEntry *newEntry = new XCCalendarDayEntry(eventListFrame, newEntryInfo.entryName, wxDefaultPosition, wxDefaultSize, calendarItems.entryList[entrySeek]); newEntry->SetColour(&newEntryCalendarInfo.calendarColour); newEntry->SetTime(newEntryInfo.entryStartHour, newEntryInfo.entryStartMinute, newEntryInfo.entryStartSecond); newEntry->SetEntryIDs(newEntryCalendarInfo.accountID, newEntryInfo.calendarID, newEntryInfo.calendarEntryID); - EventListFrameSizer->Add(newEntry, 0, wxEXPAND, 5); - wxSizerItem *afterSpacer = EventListFrameSizer->Add(0, 5, 0, 0, 5); + eventListFrameSizer->Add(newEntry, 0, wxEXPAND, 5); + wxSizerItem *afterSpacer = eventListFrameSizer->Add(0, 5, 0, 0, 5); newEntry->SetAfterSpacer(afterSpacer); @@ -334,7 +334,7 @@ void XCCalendarDay::SetupControl(int SetupDay, int SetupMonth, int SetupYear, bo } - CalendarEntryList.push_back(newEntry); + calendarEntryList.push_back(newEntry); } } @@ -346,19 +346,19 @@ void XCCalendarDay::HideAccountEntries(wxCommandEvent &accountData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - (*CalendarEntryIter)->SetShowAccountStatus(false); + (*calendarEntryIter)->SetShowAccountStatus(false); - if ((*CalendarEntryIter)->GetAccountID() == accountData.GetInt()){ + if ((*calendarEntryIter)->GetAccountID() == accountData.GetInt()){ - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(false); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(false); } @@ -377,27 +377,27 @@ void XCCalendarDay::ShowAccountEntries(wxCommandEvent &accountData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - (*CalendarEntryIter)->SetShowAccountStatus(true); + (*calendarEntryIter)->SetShowAccountStatus(true); - if ((*CalendarEntryIter)->GetShowCalendarStatus() == false){ + if ((*calendarEntryIter)->GetShowCalendarStatus() == false){ continue; } - if ((*CalendarEntryIter)->GetAccountID() == accountData.GetInt()){ + if ((*calendarEntryIter)->GetAccountID() == accountData.GetInt()){ - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(true); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(true); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(true); } - + } this->Refresh(); @@ -412,19 +412,19 @@ void XCCalendarDay::HideCalendarEntries(wxCommandEvent &calendarData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ + if ((*calendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ - (*CalendarEntryIter)->SetShowCalendarStatus(false); + (*calendarEntryIter)->SetShowCalendarStatus(false); - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(false); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(false); } @@ -443,14 +443,14 @@ void XCCalendarDay::ShowCalendarEntries(wxCommandEvent &calendarData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ + if ((*calendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ - (*CalendarEntryIter)->SetShowCalendarStatus(true); + (*calendarEntryIter)->SetShowCalendarStatus(true); - if ((*CalendarEntryIter)->GetShowAccountStatus() == false){ + if ((*calendarEntryIter)->GetShowAccountStatus() == false){ // Don't show the calendar entry because the account status // is set to hidden. Continue to the next one. @@ -459,12 +459,12 @@ void XCCalendarDay::ShowCalendarEntries(wxCommandEvent &calendarData){ } - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(true); + wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(true); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(true); } @@ -478,27 +478,27 @@ void XCCalendarDay::ShowCalendarEntries(wxCommandEvent &calendarData){ void XCCalendarDay::DeleteCalendarEntries(wxCommandEvent &calendarData){ - vector::iterator> DeleteEntriesList; + vector::iterator> deleteEntriesList; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ + if ((*calendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(false); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(false); afterSpacer->DetachSizer(); delete afterSpacer; afterSpacer = nullptr; - delete (*CalendarEntryIter); - DeleteEntriesList.push_back(CalendarEntryIter); + delete (*calendarEntryIter); + deleteEntriesList.push_back(calendarEntryIter); } @@ -507,42 +507,42 @@ void XCCalendarDay::DeleteCalendarEntries(wxCommandEvent &calendarData){ this->Refresh(); Repaint(); - for (auto DeleteIter : DeleteEntriesList){ - CalendarEntryList.erase(DeleteIter); + for (auto deleteIter : deleteEntriesList){ + calendarEntryList.erase(deleteIter); } } void XCCalendarDay::DeleteCalendarEntry(wxCommandEvent &eventData){ - vector::iterator> DeleteEntriesList; + vector::iterator> deleteEntriesList; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetEventID() == eventData.GetInt()){ + if ((*calendarEntryIter)->GetEventID() == eventData.GetInt()){ - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(false); + wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(false); afterSpacer->DetachSizer(); delete afterSpacer; afterSpacer = nullptr; - delete (*CalendarEntryIter); - DeleteEntriesList.push_back(CalendarEntryIter); + delete (*calendarEntryIter); + deleteEntriesList.push_back(calendarEntryIter); } } - for (auto DeleteIter : DeleteEntriesList){ - CalendarEntryList.erase(DeleteIter); + for (auto deleteIter : deleteEntriesList){ + calendarEntryList.erase(deleteIter); } this->Refresh(); @@ -554,7 +554,7 @@ void XCCalendarDay::AddCalendarEntry(wxCommandEvent &eventData){ EventProperties *eventInfo = (EventProperties*)eventData.GetClientData(); - XCCalendarDayEntry *newEntry = new XCCalendarDayEntry(EventListFrame, eventInfo->eventName, wxDefaultPosition, wxDefaultSize, eventInfo->eventID); + XCCalendarDayEntry *newEntry = new XCCalendarDayEntry(eventListFrame, eventInfo->eventName, wxDefaultPosition, wxDefaultSize, eventInfo->eventID); CDSGetCalendarInfo calendarInfo = dataStorage->GetCalendar(eventInfo->calendarID); @@ -562,8 +562,8 @@ void XCCalendarDay::AddCalendarEntry(wxCommandEvent &eventData){ newEntry->SetTime(eventInfo->eventHour, eventInfo->eventMinute, eventInfo->eventSecond); newEntry->SetEntryIDs(calendarInfo.accountID, eventInfo->calendarID, eventInfo->eventID); - EventListFrameSizer->Add(newEntry, 0, wxEXPAND, 5); - wxSizerItem *afterSpacer = EventListFrameSizer->Add(0, 5, 0, 0, 5); + eventListFrameSizer->Add(newEntry, 0, wxEXPAND, 5); + wxSizerItem *afterSpacer = eventListFrameSizer->Add(0, 5, 0, 0, 5); newEntry->SetAfterSpacer(afterSpacer); @@ -591,7 +591,7 @@ void XCCalendarDay::AddCalendarEntry(wxCommandEvent &eventData){ } - CalendarEntryList.push_back(newEntry); + calendarEntryList.push_back(newEntry); this->Refresh(); Repaint(); @@ -605,13 +605,13 @@ void XCCalendarDay::UpdateCalendarEntry(wxCommandEvent &eventData){ EventProperties *eventInfo = (EventProperties*)eventData.GetClientData(); - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetEventID() == eventInfo->eventID){ + if ((*calendarEntryIter)->GetEventID() == eventInfo->eventID){ - (*CalendarEntryIter)->SetEventName(eventInfo->eventName); - (*CalendarEntryIter)->SetTime(eventInfo->eventHour, eventInfo->eventMinute, eventInfo->eventSecond); + (*calendarEntryIter)->SetEventName(eventInfo->eventName); + (*calendarEntryIter)->SetTime(eventInfo->eventHour, eventInfo->eventMinute, eventInfo->eventSecond); } @@ -630,12 +630,12 @@ void XCCalendarDay::UpdateCalendarColour(wxCommandEvent &colourData){ ColourUpdateProperties *colourInfo = (ColourUpdateProperties*)colourData.GetClientData(); - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetCalendarID() == colourInfo->calendarID){ + if ((*calendarEntryIter)->GetCalendarID() == colourInfo->calendarID){ - (*CalendarEntryIter)->SetColour(&colourInfo->newColour); + (*calendarEntryIter)->SetColour(&colourInfo->newColour); }