widgets: Cleanup objects in destructors and minor code cleanup

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

diff --git a/source/widgets/XCCalendarMonthView.h b/source/widgets/XCCalendarMonthView.h
index db4962f..35e2054 100644 (file)
--- a/source/widgets/XCCalendarMonthView.h
+++ b/source/widgets/XCCalendarMonthView.h
@@ -41,23 +41,20 @@ class XCCalendarMonthView: public wxPanel
 {
        
        private:
-               wxFlexGridSizer *WindowSizer = new wxFlexGridSizer(0, 7, 1, 1);
-               vector<XCCalendarDay*> CalendarDayList;
-               wxStaticText *NumberText = nullptr;
-               XCCalendarMonthViewDayTitle *MondayText = nullptr;
-               XCCalendarMonthViewDayTitle *TuesdayText = nullptr;
-               XCCalendarMonthViewDayTitle *WednesdayText = nullptr;
-               XCCalendarMonthViewDayTitle *ThursdayText = nullptr;
-               XCCalendarMonthViewDayTitle *FridayText = nullptr;
-               XCCalendarMonthViewDayTitle *SaturdayText = nullptr;
-               XCCalendarMonthViewDayTitle *SundayText = nullptr;
+               wxFlexGridSizer *windowSizer = new wxFlexGridSizer(0, 7, 1, 1);
+               vector<XCCalendarDay*> calendarDayList;
+               XCCalendarMonthViewDayTitle *mondayText = nullptr;
+               XCCalendarMonthViewDayTitle *tuesdayText = nullptr;
+               XCCalendarMonthViewDayTitle *wednesdayText = nullptr;
+               XCCalendarMonthViewDayTitle *thursdayText = nullptr;
+               XCCalendarMonthViewDayTitle *fridayText = nullptr;
+               XCCalendarMonthViewDayTitle *saturdayText = nullptr;
+               XCCalendarMonthViewDayTitle *sundayText = nullptr;
                XCEventMenu *eventMenu = nullptr;
                CalendarDataStorage *calendarStorage = nullptr;
                
                void ProcessGrid(XCCalendarMonthViewGrid *grid, std::vector<int> *hideAccounts, std::vector<int> *hideCalendars);
        
-               void Repaint();
-       
        protected:
                void HideAccountEntries(wxCommandEvent &accountData);
                void ShowAccountEntries(wxCommandEvent &accountData);
@@ -72,12 +69,10 @@ class XCCalendarMonthView: public wxPanel
        
        public:
                XCCalendarMonthView(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector<int> *hideAccounts, std::vector<int> *hideCalendars);
-               XCCalendarMonthView(XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector<int> *hideAccounts, std::vector<int> *hideCalendars);
                ~XCCalendarMonthView();
-       
-               void PaintFrameEvent(wxPaintEvent &PaintEvent);
-               void ResizeFrameEvent(wxSizeEvent &SizeEvent);
-               void DeselectOthersEvent(wxCommandEvent &DeselectEvent);
+
+               void ResizeFrameEvent(wxSizeEvent &sizeEvent);
+               void DeselectOthersEvent(wxCommandEvent &deselectEvent);
        
        DECLARE_EVENT_TABLE()