X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDay.h;h=5bdf7ed84170efd7ea61482200ffb1330cf2db02;hb=ed4644cc1c246d7c7ccc20f09cc7d587f6654668;hp=e1a884be0cb773bc64cc46eb1c5cbbfbe6fc9131;hpb=c9db1bda434713b98f282ef6bb9abd5a2337bb9e;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarDay.h b/source/widgets/XCCalendarDay.h
index e1a884b..5bdf7ed 100644
--- a/source/widgets/XCCalendarDay.h
+++ b/source/widgets/XCCalendarDay.h
@@ -21,16 +21,21 @@
 
 #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
 {
 	private:
+		XCCalendarMonthView *MonthViewPointer = nullptr;
 		wxFlexGridSizer *WindowSizer = new wxFlexGridSizer(2, 1, 0, 0);
 		wxBoxSizer *TopSectionSizer = new wxBoxSizer(wxHORIZONTAL);
 		wxBoxSizer *MainSectionSizer = new wxBoxSizer(wxVERTICAL);
@@ -42,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();
 	
@@ -64,10 +62,12 @@ class XCCalendarDay: public wxPanel
 		void PaintFrameEvent(wxPaintEvent &PaintEvent);
 		void ResizeFrameEvent(wxSizeEvent &SizeEvent);
 		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()
+
 };
 
 #endif
\ No newline at end of file