XCCalendar widgets: Removed painting of controls

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

diff --git a/source/widgets/XCCalendarDay.h b/source/widgets/XCCalendarDay.h
index bd51a62..e00379b 100644 (file)
--- a/source/widgets/XCCalendarDay.h
+++ b/source/widgets/XCCalendarDay.h
@@ -38,17 +38,19 @@ class XCCalendarDay: public wxPanel
 {
        private:
                XCCalendarMonthView *monthViewPointer = nullptr;
-               wxFlexGridSizer *windowSizer = new wxFlexGridSizer(2, 1, 0, 0);
+               wxPanel *topPanel = nullptr;
+               wxPanel *mainPanel = nullptr;
+               wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL);
                wxBoxSizer *topSectionSizer = new wxBoxSizer(wxHORIZONTAL);
                wxBoxSizer *mainSectionSizer = new wxBoxSizer(wxVERTICAL);
                wxBoxSizer *eventListFrameSizer = new wxBoxSizer(wxVERTICAL);
-               wxStaticBitmap *highPriorityIcon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(32,32), 0);
-               wxStaticBitmap *alertIcon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(32,32), 0);
+               wxStaticBitmap *highPriorityIcon = nullptr;
+               wxStaticBitmap *alertIcon = nullptr;
                CalendarDataStorage *dataStorage = nullptr;
                wxBitmap alertIconBitmap;
                wxBitmap priorityIconBitmap;
                wxStaticText *numberText = nullptr;
-               wxScrolledWindow *eventListFrame = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL);
+               wxScrolledWindow *eventListFrame = nullptr;
                int calendarEntrySeekNumber = 0;
                int calendarDay = 0;
                int calendarMonth = 0;
@@ -57,8 +59,6 @@ class XCCalendarDay: public wxPanel
        
                vector<XCCalendarDayEntry*> calendarEntryList;
        
-               void Repaint();
-       
        protected:
                void HideAccountEntries(wxCommandEvent &accountData);
                void ShowAccountEntries(wxCommandEvent &accountData);
@@ -73,7 +73,6 @@ class XCCalendarDay: public wxPanel
        public:
                XCCalendarDay(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size);
                ~XCCalendarDay();
-               void PaintFrameEvent(wxPaintEvent &paintEvent);
                void ResizeFrameEvent(wxSizeEvent &sizeEvent);
                void DeselectOthersEvent(wxCommandEvent &deselectEvent);
                void DeselectAllEvent(wxCommandEvent &deselectEvent);