XCCalendarDay/XCCalendarMonthView: Fixed browse after deleting event

[xestiacalendar/.git] / source / widgets / XCCalendarDay.cpp

diff --git a/source/widgets/XCCalendarDay.cpp b/source/widgets/XCCalendarDay.cpp
index 5d48472..54e1196 100644 (file)
--- a/source/widgets/XCCalendarDay.cpp
+++ b/source/widgets/XCCalendarDay.cpp
@@ -105,14 +105,21 @@ 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();
        
 }
 
@@ -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);