X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarMonthSelect.cpp;h=cb45c1b35a1bb5cd9ae7ba70209a0d2c1209b649;hp=94e9421fdd406585b443a748607b7aa7b7d81472;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=f1ecf412b80a5c25421595fde8f1e86131414f4c

diff --git a/source/widgets/XCCalendarMonthSelect.cpp b/source/widgets/XCCalendarMonthSelect.cpp
index 94e9421..cb45c1b 100644
--- 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);
 	
 }