using namespace std;
+wxDEFINE_EVENT(XCCALENDARDAY_DESELECTOTHERENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_DESELECTALLENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_HIDEACCOUNTENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_SHOWACCOUNTENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_HIDECALENDARENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_SHOWCALENDARENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_DELETECALENDARENTRIES, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_DELETEENTRY, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_ADDENTRY, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_UPDATEENTRY, wxCommandEvent);
+wxDEFINE_EVENT(XCCALENDARDAY_UPDATECALENDARCOLOUR, wxCommandEvent);
+
BEGIN_EVENT_TABLE(XCCalendarDay, wxPanel)
EVT_PAINT(XCCalendarDay::PaintFrameEvent)
EVT_SIZE(XCCalendarDay::ResizeFrameEvent)
XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size)
: wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title){
-
this->SetMinSize( wxSize( 100,100 ) );
// Setip the icons.
eventListFrame->SetSizer(eventListFrameSizer);
eventListFrame->SetScrollRate(0,1);
- //EventListFrameSizer->FitInside(EventListFrame);
- eventListFrameSizer->Fit(EventListFrame);
+ eventListFrameSizer->Fit(eventListFrame);
eventListFrameSizer->Layout();
windowSizer->Fit(this);
UpdateTopIcons();
- Connect(ID_DESELECTOTHERENTRIES, XCCALENDARDAY_DESELECTOTHERENTRIES, wxCommandEventHandler(XCCalendarDay::DeselectOthersEvent));
- Connect(ID_DESELECTALLITEMS, XCCALENDARDAY_DESELECTALLENTRIES, wxCommandEventHandler(XCCalendarDay::DeselectAllEvent));
- Connect(ID_HIDEENTRIES, XCCALENDARDAY_HIDEACCOUNTENTRIES, wxCommandEventHandler(XCCalendarDay::HideAccountEntries));
- Connect(ID_SHOWENTRIES, XCCALENDARDAY_SHOWACCOUNTENTRIES, wxCommandEventHandler(XCCalendarDay::ShowAccountEntries));
- Connect(ID_HIDECALENDARENTRIES, XCCALENDARDAY_HIDECALENDARENTRIES, wxCommandEventHandler(XCCalendarDay::HideCalendarEntries));
- Connect(ID_SHOWCALENDARENTRIES, XCCALENDARDAY_SHOWCALENDARENTRIES, wxCommandEventHandler(XCCalendarDay::ShowCalendarEntries));
- Connect(ID_DELETECALENDARENTRIES, XCCALENDARDAY_DELETECALENDARENTRIES, wxCommandEventHandler(XCCalendarDay::DeleteCalendarEntries));
- Connect(ID_DELETEENTRY, XCCALENDARDAY_DELETEENTRY, wxCommandEventHandler(XCCalendarDay::DeleteCalendarEntry));
- Connect(ID_ADDENTRY, XCCALENDARDAY_ADDENTRY, wxCommandEventHandler(XCCalendarDay::AddCalendarEntry));
- Connect(ID_UPDATEENTRY, XCCALENDARDAY_UPDATEENTRY, wxCommandEventHandler(XCCalendarDay::UpdateCalendarEntry));
- Connect(ID_UPDATECOLOUR, XCCALENDARDAY_UPDATECALENDARCOLOUR, wxCommandEventHandler(XCCalendarDay::UpdateCalendarColour));
-
+ // Bind events to the control.
+
+ Bind(XCCALENDARDAY_DESELECTOTHERENTRIES, &XCCalendarDay::DeselectOthersEvent, this, ID_DESELECTOTHERENTRIES);
+ Bind(XCCALENDARDAY_DESELECTALLENTRIES, &XCCalendarDay::DeselectAllEvent, this, ID_DESELECTALLITEMS);
+ Bind(XCCALENDARDAY_HIDEACCOUNTENTRIES, &XCCalendarDay::HideAccountEntries, this, ID_HIDEENTRIES);
+ Bind(XCCALENDARDAY_SHOWACCOUNTENTRIES, &XCCalendarDay::ShowAccountEntries, this, ID_SHOWENTRIES);
+ Bind(XCCALENDARDAY_HIDECALENDARENTRIES, &XCCalendarDay::HideCalendarEntries, this, ID_HIDECALENDARENTRIES);
+ Bind(XCCALENDARDAY_SHOWCALENDARENTRIES, &XCCalendarDay::ShowCalendarEntries, this, ID_SHOWCALENDARENTRIES);
+ Bind(XCCALENDARDAY_DELETECALENDARENTRIES, &XCCalendarDay::DeleteCalendarEntries, this, ID_DELETECALENDARENTRIES);
+ Bind(XCCALENDARDAY_DELETEENTRY, &XCCalendarDay::DeleteCalendarEntry, this, ID_DELETEENTRY);
+ Bind(XCCALENDARDAY_ADDENTRY, &XCCalendarDay::AddCalendarEntry, this, ID_ADDENTRY);
+ Bind(XCCALENDARDAY_UPDATEENTRY, &XCCalendarDay::UpdateCalendarEntry, this, ID_UPDATEENTRY);
+ Bind(XCCALENDARDAY_UPDATECALENDARCOLOUR, &XCCalendarDay::UpdateCalendarColour, this, ID_UPDATECOLOUR);
}
XCCalendarDay::~XCCalendarDay(){
for (vector<XCCalendarDayEntry*>::iterator calendarEntryIter = calendarEntryList.begin();
calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){
-
+
delete((*calendarEntryIter));
}
+
+ delete alertIcon;
+ alertIcon = nullptr;
- calendarEntryList.clear();
+ delete highPriorityIcon;
+ highPriorityIcon = nullptr;
- this->Refresh();
+ delete eventListFrame;
+ eventListFrame = nullptr;
+
+ calendarEntryList.clear();
}
wxPostEvent((*entryIter), deselectEntryEvent);
}
-
+
}
// Send event notification to deselect the other calendar entries.
}
-void XCCalendarDay::DeselectAllEvent(wxCommandEvent &DeselectEvent)
+void XCCalendarDay::DeselectAllEvent(wxCommandEvent &deselectEvent)
{
int selectedEntryID = deselectEvent.GetInt();
deselectEntryEvent.SetId(ID_ENTRYDESELECT);
for (vector<XCCalendarDayEntry*>::iterator entryIter = calendarEntryList.begin();
- entryIter != calendarEntryList.end(); EntryIter++){
+ entryIter != calendarEntryList.end(); entryIter++){
wxPostEvent((*entryIter), deselectEntryEvent);
}
- wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*calendarEntryIter));
+ wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter));
(*calendarEntryIter)->Show(true);
// Get the spacing and hide it as well.
// 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;
+ afterSpacer = nullptr;*/
delete (*calendarEntryIter);
deleteEntriesList.push_back(calendarEntryIter);
if ((*calendarEntryIter)->GetEventID() == eventData.GetInt()){
- wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*calendarEntryIter));
+ 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;
+ afterSpacer = nullptr;*/
delete (*calendarEntryIter);
deleteEntriesList.push_back(calendarEntryIter);