X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDay.h;h=580c4cf4c84c0bfe1b73670f7ecfcca41519abaf;hb=fb61a8df39e632cce6dfd8b421f410f041a25760;hp=0a409cea14023744c0a6dee8ebb28cf72b4acc38;hpb=6c8e63ef1570701099e4f5a85115f89ae0fe9cc0;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarDay.h b/source/widgets/XCCalendarDay.h
index 0a409ce..580c4cf 100644
--- a/source/widgets/XCCalendarDay.h
+++ b/source/widgets/XCCalendarDay.h
@@ -21,14 +21,20 @@
 
 #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"
 
-class XCCalendarDay: public wxFrame
+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);
@@ -40,30 +46,24 @@ class XCCalendarDay: public wxFrame
 		wxStaticText *NumberText = nullptr;
 		wxScrolledWindow *EventListFrame = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL);
 		int CalendarEntrySeekNumber = 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();
 	
 	public:
-		XCCalendarDay(const wxString& title, const wxPoint& pos, const wxSize& size);
+		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);
 		void UpdateTopIcons();
+		void SetupControl(int SetupDay, int SetupMonth, int SetupYear, bool SetupIsInMonth, XCCalendarMonthView *MonthViewPointer);
 	
 	DECLARE_EVENT_TABLE()
+
 };
 
 #endif
\ No newline at end of file