// Setup the top menu.
- ManipulatorCtrl = new XCCalendarManipulator(this, "XCCalendarManipulator Test", wxDefaultPosition, wxDefaultSize, calendarStorage);
+ manipulatorCtrl = new XCCalendarManipulator(this, "XCCalendarManipulator Test", wxDefaultPosition, wxDefaultSize, calendarStorage);
// Setup the month view grid.
- wxDateTime DTNow = wxDateTime::Now();
- int currentMonth = ((int)DTNow.GetMonth() + 1);
- int currentYear = DTNow.GetYear();
+ wxDateTime dtNow = wxDateTime::Now();
+ int currentMonth = ((int)dtNow.GetMonth() + 1);
+ int currentYear = dtNow.GetYear();
XCCalendarMonthViewGrid CurrentMonthGrid = GenerateMonthGrid(currentMonth, currentYear);
- szrMain->Add(ManipulatorCtrl, 1, wxEXPAND, 5);
+ szrMain->Add(manipulatorCtrl, 1, wxEXPAND, 5);
// Get the list of hidden accounts and calendars.
- vector<int> hideAccountsList = ManipulatorCtrl->GetHiddenAccountsList();
- vector<int> hideCalendarsList = ManipulatorCtrl->GetHiddenCalendarsList();
+ vector<int> hideAccountsList = manipulatorCtrl->GetHiddenAccountsList();
+ vector<int> hideCalendarsList = manipulatorCtrl->GetHiddenCalendarsList();
- MonthViewCtrl = new XCCalendarMonthView(this, "XCCalendarMonthView Test", wxDefaultPosition, wxDefaultSize, &CurrentMonthGrid, calendarStorage, &hideAccountsList, &hideCalendarsList);
- szrMain->Add(MonthViewCtrl, 1, wxEXPAND, 5);
+ monthViewCtrl = new XCCalendarMonthView(this, "XCCalendarMonthView Test", wxDefaultPosition, wxDefaultSize, &CurrentMonthGrid, calendarStorage, &hideAccountsList, &hideCalendarsList);
+ szrMain->Add(monthViewCtrl, 1, wxEXPAND, 5);
// Connect events to the control.
void XCCalendarCtrl::UpdateGrid(wxCommandEvent &event){
- XCCalendarMonthView *OldGrid = nullptr;
+ XCCalendarMonthView *oldGrid = nullptr;
// Park the old grid.
- OldGrid = MonthViewCtrl;
+ oldGrid = monthViewCtrl;
// Get the list of hidden accounts and calendars.
- vector<int> hideAccountsList = ManipulatorCtrl->GetHiddenAccountsList();
- vector<int> hideCalendarsList = ManipulatorCtrl->GetHiddenCalendarsList();
+ vector<int> hideAccountsList = manipulatorCtrl->GetHiddenAccountsList();
+ vector<int> hideCalendarsList = manipulatorCtrl->GetHiddenCalendarsList();
// Create a new grid.
- XCCalendarMonthViewGrid NewGrid = GenerateMonthGrid(ManipulatorCtrl->GetMonth(), ManipulatorCtrl->GetYear());
- MonthViewCtrl = new XCCalendarMonthView(this, _(""), wxDefaultPosition, wxDefaultSize, &NewGrid, calendarStorage, &hideAccountsList, &hideCalendarsList);
+ XCCalendarMonthViewGrid NewGrid = GenerateMonthGrid(manipulatorCtrl->GetMonth(), manipulatorCtrl->GetYear());
+ monthViewCtrl = new XCCalendarMonthView(this, _(""), wxDefaultPosition, wxDefaultSize, &NewGrid, calendarStorage, &hideAccountsList, &hideCalendarsList);
// Detach the old grid and attach the new one.
szrMain->Detach(1);
- OldGrid->Show(false);
- szrMain->Add(MonthViewCtrl, 1, wxEXPAND, 5);
+ oldGrid->Show(false);
+ szrMain->Add(monthViewCtrl, 1, wxEXPAND, 5);
szrMain->Layout();
// Delete the old grid.
- delete OldGrid;
- OldGrid = nullptr;
+ delete oldGrid;
+ oldGrid = nullptr;
}
wxCommandEvent event(XCCALENDARMONTH_HIDEACCOUNTENTRIES);
event.SetInt(accountData.GetInt());
event.SetId(ID_HIDEENTRIES);
- wxPostEvent(MonthViewCtrl, event);
+ wxPostEvent(monthViewCtrl, event);
}
wxCommandEvent event(XCCALENDARMONTH_SHOWACCOUNTENTRIES);
event.SetInt(accountData.GetInt());
event.SetId(ID_SHOWENTRIES);
- wxPostEvent(MonthViewCtrl, event);
+ wxPostEvent(monthViewCtrl, event);
}
wxCommandEvent event(XCCALENDARMONTH_HIDECALENDARENTRIES);
event.SetInt(calendarData.GetInt());
event.SetId(ID_HIDECALENDARENTRIES);
- wxPostEvent(MonthViewCtrl, event);
+ wxPostEvent(monthViewCtrl, event);
}
wxCommandEvent event(XCCALENDARMONTH_SHOWCALENDARENTRIES);
event.SetInt(calendarData.GetInt());
event.SetId(ID_SHOWCALENDARENTRIES);
- wxPostEvent(MonthViewCtrl, event);
+ wxPostEvent(monthViewCtrl, event);
}
wxCommandEvent event(XCCALENDARMONTH_DELETECALENDARENTRIES);
event.SetInt(calendarData.GetInt());
event.SetId(ID_DELETECALENDARENTRIES);
- wxPostEvent(MonthViewCtrl, event);
+ wxPostEvent(monthViewCtrl, event);
}
wxCommandEvent event(XCCALENDARMONTH_DELETEENTRY);
event.SetInt(eventData.GetInt());
event.SetId(ID_DELETEENTRY);
- wxPostEvent(MonthViewCtrl, event);
+ wxPostEvent(monthViewCtrl, event);
}
EventProperties *eventInfo = (EventProperties*)eventData.GetClientData();
- eventInfo->hideAccountsList = ManipulatorCtrl->GetHiddenAccountsList();
- eventInfo->hideCalendarsList = ManipulatorCtrl->GetHiddenCalendarsList();
+ eventInfo->hideAccountsList = manipulatorCtrl->GetHiddenAccountsList();
+ eventInfo->hideCalendarsList = manipulatorCtrl->GetHiddenCalendarsList();
wxCommandEvent addEvent(XCCALENDARMONTH_ADDENTRY);
addEvent.SetId(ID_ADDENTRY);
addEvent.SetClientData(eventInfo);
- wxPostEvent(MonthViewCtrl, addEvent);
+ wxPostEvent(monthViewCtrl, addEvent);
}
wxCommandEvent addEvent(XCCALENDARMONTH_UPDATEENTRY);
addEvent.SetId(ID_UPDATEENTRY);
addEvent.SetClientData(eventInfo);
- wxPostEvent(MonthViewCtrl, addEvent);
+ wxPostEvent(monthViewCtrl, addEvent);
}
wxCommandEvent colourEvent(XCCALENDARMONTH_UPDATECALENDARCOLOUR);
colourEvent.SetId(ID_UPDATECOLOUR);
colourEvent.SetClientData(colourInfo);
- wxPostEvent(MonthViewCtrl, colourEvent);
+ wxPostEvent(monthViewCtrl, colourEvent);
}
\ No newline at end of file