widgets: Cleanup objects in destructors and minor code cleanup

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

diff --git a/source/widgets/XCCalendarMonthSelect.cpp b/source/widgets/XCCalendarMonthSelect.cpp
index 94e9421..cb45c1b 100644 (file)
--- a/source/widgets/XCCalendarMonthSelect.cpp
+++ b/source/widgets/XCCalendarMonthSelect.cpp
@@ -60,11 +60,24 @@ XCCalendarMonthSelect::XCCalendarMonthSelect(wxWindow *parent)
        
        btnChange->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarMonthSelect::UpdateMonthView), NULL, this);
 
+       this->Layout();
 }
 
 XCCalendarMonthSelect::~XCCalendarMonthSelect(){
        
+       szrMain->Clear();
        
+       delete cmbMonth;
+       cmbMonth = nullptr;
+       
+       delete spcYear;
+       spcYear = nullptr;
+       
+       btnChange->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarMonthSelect::UpdateMonthView), NULL, this);
+       delete btnChange;
+       btnChange = nullptr;
+       
+       this->SetSizer(nullptr, true);
        
 }
 
@@ -82,6 +95,7 @@ void XCCalendarMonthSelect::UpdateMonthView(wxCommandEvent &event){
        
        this->Dismiss();
        wxCommandEvent UpdateGrid(XCCALENDARMANIPULATOR_CHANGEGRID);
+       UpdateGrid.SetId(ID_CHANGEGRID);
        wxPostEvent(this->GetParent(), UpdateGrid);
        
 }