X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDayEntry.cpp;h=0aede5632f75b055a5b528df0aff9d367fd3ba7b;hb=0efd41cdb657851e3a008aa7e3a7b9e46a62235d;hp=136d5c64ea950f6451f112d9c7b525d128d05192;hpb=401fd2eee6047f72fdaf811bbcc3924409a4fb9d;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarDayEntry.cpp b/source/widgets/XCCalendarDayEntry.cpp
index 136d5c6..0aede56 100644
--- a/source/widgets/XCCalendarDayEntry.cpp
+++ b/source/widgets/XCCalendarDayEntry.cpp
@@ -18,6 +18,8 @@
 
 #include "XCCalendarDayEntry.h"
 
+wxDEFINE_EVENT(XCCALENDARDAYENTRY_DESELECT, wxCommandEvent);
+
 BEGIN_EVENT_TABLE(XCCalendarDayEntry, wxPanel)
 EVT_PAINT(XCCalendarDayEntry::PaintFrameEvent)
 EVT_SIZE(XCCalendarDayEntry::ResizeFrameEvent)
@@ -29,7 +31,6 @@ using namespace std;
 
 XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, const int id)
         : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title){
-	
 	dayPanel = parent->GetParent();
 	eventID = id;
 	
@@ -54,8 +55,6 @@ XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title,
 		
 	alarmIcon->SetBitmap(alarmIconBitmap);
 	highPriorityIcon->SetBitmap(priorityIconBitmap);
-
-	Connect(ID_ENTRYDESELECT, XCCALENDARDAYENTRY_DESELECT, wxCommandEventHandler(XCCalendarDayEntry::Deselect));
 	
 	alarmIcon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this);
 	highPriorityIcon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this);
@@ -71,6 +70,9 @@ XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title,
 
 	UpdateInformation();
 	
+	// Bind events to the control.
+	
+	Bind(XCCALENDARDAYENTRY_DESELECT, &XCCalendarDayEntry::Deselect, this, ID_ENTRYDESELECT);
 }
 
 XCCalendarDayEntry::~XCCalendarDayEntry(){
@@ -246,21 +248,21 @@ void XCCalendarDayEntry::SetTime(int timeHour, int timeMinute, int timeSecond){
 	
 }
 
-void XCCalendarDayEntry::SetColour(Colour *ColourIn){
+void XCCalendarDayEntry::SetColour(Colour *colourIn){
 	
 	entryColour = *colourIn;
 	Repaint();
 	
 }
 
-void XCCalendarDayEntry::SetDisplayAlarm(bool DisplayValue){
+void XCCalendarDayEntry::SetDisplayAlarm(bool displayValue){
 	
 	hasAlarm = displayValue;
 	UpdateInformation();
 	
 }
 
-void XCCalendarDayEntry::SetDisplayHighPriority(bool DisplayValue){
+void XCCalendarDayEntry::SetDisplayHighPriority(bool displayValue){
 	
 	hasHighPriority = displayValue;
 	UpdateInformation();