X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDayEntry.h;h=823a44c8cc910862bbe3843c0c1ae651e4856cef;hp=84f6378246eab5653d5b311263eeea9b263cb75a;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=c5716d0f27f0f917282df9121aa97eab7a1bf6b8

diff --git a/source/widgets/XCCalendarDayEntry.h b/source/widgets/XCCalendarDayEntry.h
index 84f6378..823a44c 100644
--- a/source/widgets/XCCalendarDayEntry.h
+++ b/source/widgets/XCCalendarDayEntry.h
@@ -1,14 +1,14 @@
 // XCCalendarDayEntry.h - Xestia Calendar XCCalendarDayEntry widget class.
 //
-// (c) 2016 Xestia Software Development.
+// (c) 2016-2017 Xestia Software Development.
 //
 // This file is part of Xestia Calendar.
 //
-// Xestia Address Book is free software: you can redistribute it and/or modify
+// Xestia Calendar is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by the
 // Free Software Foundation, version 3 of the license.
 //
-// Xestia Address Book is distributed in the hope that it will be useful,
+// Xestia Calendar is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
@@ -38,25 +38,29 @@ class XCCalendarDayEntry: public wxPanel
 {
 	
 	private:
-		wxWindow *DayPanel = nullptr;
-		string EventTextData = "";
-		wxStaticText *EventTime = nullptr;
-		wxStaticText *EventText = nullptr;
-		wxStaticBitmap *HighPriorityIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(14,7), wxDefaultSize, 0 );
-		wxStaticBitmap *AlarmIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(30,7), wxDefaultSize, 0 );
+		wxWindow *dayPanel = nullptr;
+		wxPanel *mainPanel = nullptr;
+		wxPanel *borderPanel = nullptr;
+		wxPanel *calendarColour = nullptr;
+		string eventTextData = "";
+		wxStaticText *eventTime = nullptr;
+		wxStaticText *eventText = nullptr;
+		wxStaticBitmap *highPriorityIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(14,7), wxDefaultSize, 0 );
+		wxStaticBitmap *alarmIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(30,7), wxDefaultSize, 0 );
+		wxBoxSizer *mainSizer = nullptr;
 		wxSizerItem *afterSpacer = nullptr;
-		wxBitmap AlarmIconBitmap;
-		wxBitmap PriorityIconBitmap;
+		wxBitmap alarmIconBitmap;
+		wxBitmap priorityIconBitmap;
 	
-		Colour EntryColour;
+		Colour entryColour;
 	
 		int timeHour = 0;
 		int timeMinute = 0;
 		int timeSecond = 0;
 	
-		bool HasAlarm = false;
-		bool HasHighPriority = false;
-		int PositionMode = 0;
+		bool hasAlarm = false;
+		bool hasHighPriority = false;
+		int positionMode = 0;
 	
 		int eventID = 0;
 		int accountID = 0;
@@ -64,12 +68,9 @@ class XCCalendarDayEntry: public wxPanel
 		bool showAccount = true;
 		bool showCalendar = true;
 	
-		const int FirstPosition = 14;
-		const int SecondPosition = 30;
-		const int ThirdPosition = 49;
-	
-		void Repaint();
-		void RepaintSelected();
+		const int firstPosition = 14;
+		const int secondPosition = 30;
+		const int thirdPosition = 49;
 	
 		void UpdateInformation();
 		
@@ -83,14 +84,13 @@ class XCCalendarDayEntry: public wxPanel
 		XCCalendarDayEntry(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, const int id);
 		~XCCalendarDayEntry();
 	
-		void PaintFrameEvent(wxPaintEvent &PaintEvent);
-		void ResizeFrameEvent(wxSizeEvent &SizeEvent);
-		void Deselect(wxCommandEvent &DeselectEvent);
+		void ResizeFrameEvent(wxSizeEvent &sizeEvent);
+		void Deselect(wxCommandEvent &deselectEvent);
 	
 		void SetTime(int timeHour, int timeMinute, int timeSecond);
-		void SetColour(Colour *ColourIn);
-		void SetDisplayAlarm(bool DisplayValue);
-		void SetDisplayHighPriority(bool DisplayValue);
+		void SetColour(Colour *colourIn);
+		void SetDisplayAlarm(bool displayValue);
+		void SetDisplayHighPriority(bool displayValue);
 		void SetEntryIDs(int accountID, int calendarID, int eventID);
 		void SetAfterSpacer(wxSizerItem *afterSpacer);
 		void SetEventName(std::string eventName);
@@ -101,8 +101,8 @@ class XCCalendarDayEntry: public wxPanel
 		wxSizerItem* GetAfterSpacer();
 		bool GetDisplayAlarm();
 		bool GetDisplayHighPriority();
-		bool SetShowAccountStatus(bool statusInput);
-		bool SetShowCalendarStatus(bool statusInput);
+		void SetShowAccountStatus(bool statusInput);
+		void SetShowCalendarStatus(bool statusInput);
 		bool GetShowAccountStatus();
 		bool GetShowCalendarStatus();