X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarListCalendarCtrl.cpp;h=371b1233afe4872950db29d4fad14953259b5079;hp=3729231539ae7090255d869fadae95af1370a382;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=c5716d0f27f0f917282df9121aa97eab7a1bf6b8

diff --git a/source/widgets/XCCalendarListCalendarCtrl.cpp b/source/widgets/XCCalendarListCalendarCtrl.cpp
index 3729231..371b123 100644
--- a/source/widgets/XCCalendarListCalendarCtrl.cpp
+++ b/source/widgets/XCCalendarListCalendarCtrl.cpp
@@ -34,7 +34,7 @@ XCCalendarListCalendarCtrl::XCCalendarListCalendarCtrl(wxWindow* parent, string
 	
 	// Setup the label.
 	
-	lblCalendarName = new wxStaticText(this, wxID_ANY, wxString(calendarName), wxDefaultPosition, wxDefaultSize, 0, "");
+	lblCalendarName = new wxStaticText(this, wxID_ANY, wxString(calendarName.c_str(), wxConvUTF8), wxDefaultPosition, wxDefaultSize, 0, "");
 	
 	// Setup the colour.
 		
@@ -68,6 +68,31 @@ XCCalendarListCalendarCtrl::XCCalendarListCalendarCtrl(wxWindow* parent, string
 XCCalendarListCalendarCtrl::~XCCalendarListCalendarCtrl(){
 	
 	// Delete the controls.
+
+	chkShowCalendar->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxMouseEventHandler(XCCalendarListCalendarCtrl::ShowAllCheckboxClick), NULL, this);
+	chkShowCalendar->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarListCalendarCtrl::PopupMenu), NULL, this);
+	lblCalendarName->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarListCalendarCtrl::PopupMenu), NULL, this);
+	pnlColour->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarListCalendarCtrl::PopupMenu), NULL, this);
+	Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarListCalendarCtrl::PopupMenu), NULL, this);
+	
+	szrMain->Clear();
+	
+	delete chkShowCalendar;
+	chkShowCalendar = nullptr;
+	
+	delete lblCalendarName;
+	lblCalendarName = nullptr;
+	
+	delete imgCalendarIcon;
+	imgCalendarIcon = nullptr;
+
+	delete calendarMenu;
+	calendarMenu = nullptr;
+
+	delete pnlColour;
+	pnlColour = nullptr;
+
+	this->SetSizer(nullptr, true);
 	
 }