widgets: Cleanup objects in destructors and minor code cleanup

[xestiacalendar/.git] / source / widgets / XCCalendarDayEntry.h

diff --git a/source/widgets/XCCalendarDayEntry.h b/source/widgets/XCCalendarDayEntry.h
index 6daf755..823a44c 100644 (file)
--- a/source/widgets/XCCalendarDayEntry.h
+++ b/source/widgets/XCCalendarDayEntry.h
@@ -39,11 +39,15 @@ class XCCalendarDayEntry: public wxPanel
        
        private:
                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;
@@ -68,9 +72,6 @@ class XCCalendarDayEntry: public wxPanel
                const int secondPosition = 30;
                const int thirdPosition = 49;
        
-               void Repaint();
-               void RepaintSelected();
-       
                void UpdateInformation();
                
                string BuildEventTime(int timeHour, int timeMinute);
@@ -83,7 +84,6 @@ 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);
        
@@ -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();