XCCalendarDay: Removed unused code and added code to add event controls

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

diff --git a/source/widgets/XCCalendarDay.h b/source/widgets/XCCalendarDay.h
index aed2bca..5bdf7ed 100644 (file)
--- a/source/widgets/XCCalendarDay.h
+++ b/source/widgets/XCCalendarDay.h
@@ -21,12 +21,15 @@
 
 #include <wx/wx.h>
 #include <wx/dcbuffer.h>
+#include <wx/mstream.h>
 #include <vector>
 
 #include "XCCalendarDayEntry.h"
 #include "XCCalendarMonthView.h"
 #include "../common/events.h"
+#include "../bitmaps.h"
 
+#include "../libraries/CalendarDataStorage/CalendarDataStorage.h"
 class XCCalendarMonthView;
 
 class XCCalendarDay: public wxPanel
@@ -44,19 +47,12 @@ class XCCalendarDay: public wxPanel
                wxStaticText *NumberText = nullptr;
                wxScrolledWindow *EventListFrame = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL);
                int CalendarEntrySeekNumber = 0;
+               int calendarDay = 0;
+               int calendarMonth = 0;
+               int calendarYear = 0;
                bool IsInMonth = false;
        
                vector<XCCalendarDayEntry*> CalendarEntryList;
-               XCCalendarDayEntry *CalendarEntry1 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 1", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry2 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 2", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry3 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 3", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry4 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 4", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry5 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 5", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry6 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 6", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry7 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 7", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry8 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 8", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry9 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 9", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
-               XCCalendarDayEntry *CalendarEntry10 = new XCCalendarDayEntry(EventListFrame, "Calendar Entry 10", wxDefaultPosition, wxDefaultSize, CalendarEntrySeekNumber++);
        
                void Repaint();
        
@@ -68,7 +64,7 @@ class XCCalendarDay: public wxPanel
                void DeselectOthersEvent(wxCommandEvent &DeselectEvent);
                void DeselectAllEvent(wxCommandEvent &DeselectEvent);
                void UpdateTopIcons();
-               void SetupControl(int SetupDay, int SetupMonth, int SetupYear, bool SetupIsInMonth, XCCalendarMonthView *MonthViewPointer);
+               void SetupControl(int SetupDay, int SetupMonth, int SetupYear, bool SetupIsInMonth, XCCalendarMonthView *MonthViewPointer, CalendarDataStorage *dataStorage);
        
        DECLARE_EVENT_TABLE()