X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDay.cpp;h=54e1196c936789e04c7f9683dcef2225a8033b68;hp=5d484726b36ef371dccbebfe735d7b1a0e549d16;hb=a245ca84f8c7aacc34c966c4b8c6ca34a0fa0c1c;hpb=e5e8bdcfe81d4184b57623167b55cd6bdab9fe90 diff --git a/source/widgets/XCCalendarDay.cpp b/source/widgets/XCCalendarDay.cpp index 5d48472..54e1196 100644 --- a/source/widgets/XCCalendarDay.cpp +++ b/source/widgets/XCCalendarDay.cpp @@ -105,14 +105,21 @@ XCCalendarDay::~XCCalendarDay(){ for (vector::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(); } @@ -490,12 +497,12 @@ void XCCalendarDay::DeleteCalendarEntries(wxCommandEvent &calendarData){ // 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); @@ -527,12 +534,12 @@ void XCCalendarDay::DeleteCalendarEntry(wxCommandEvent &eventData){ // 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);