X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarManipulator.h;h=83365e60a3db0fdd4ea383913c56a2051a5037bf;hp=1a69bc110dcbc1975df45513bc65a55522eb6521;hb=df012cf9ec9670db199095c4f4408dff556c4d5f;hpb=fb61a8df39e632cce6dfd8b421f410f041a25760

diff --git a/source/widgets/XCCalendarManipulator.h b/source/widgets/XCCalendarManipulator.h
index 1a69bc1..83365e6 100644
--- a/source/widgets/XCCalendarManipulator.h
+++ b/source/widgets/XCCalendarManipulator.h
@@ -1,14 +1,14 @@
 // XCCalendarManipulator.h - Xestia Calendar XCCalendarManipulator header file.
 //
-// (c) 2016 Xestia Software Development.
+// (c) 2016-2017 Xestia Software Development.
 //
 // This file is part of Xestia Calendar.
 //
-// Xestia Address Book is free software: you can redistribute it and/or modify
+// Xestia Calendar is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by the
 // Free Software Foundation, version 3 of the license.
 //
-// Xestia Address Book is distributed in the hope that it will be useful,
+// Xestia Calendar is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
@@ -20,13 +20,18 @@
 #define __WIDGETS_XCCALENDARMANIPULATOR_H__
 
 #include <string>
+#include <vector>
 
 #include <wx/wx.h>
 #include <wx/dcbuffer.h>
 #include <wx/mstream.h>
 
 #include "events.h"
+#if defined(WIN32) || defined(__APPLE__)
+#include "../forms/calendarselectmonth/frmCalendarSelectMonth.h"
+#else
 #include "XCCalendarMonthSelect.h"
+#endif
 #include "XCCalendarList.h"
 #include "../bitmaps.h"
 #include "../libraries/CalendarDataStorage/CalendarDataStorage.h"
@@ -38,23 +43,30 @@ class XCCalendarManipulator: public wxPanel
 		wxBoxSizer *szrMain = nullptr;
 		wxBoxSizer *szrNavigation = nullptr;
 		wxPanel *pnlMain = nullptr;
-		wxButton *PreviousButton = nullptr;
-		wxButton *NextButton = nullptr;
-		wxButton *CalendarsButton = nullptr;
-		wxButton *DateButton = nullptr;
-		XCCalendarMonthSelect *Moo = nullptr;
+		wxButton *previousButton = nullptr;
+		wxButton *nextButton = nullptr;
+		wxButton *calendarsButton = nullptr;
+		wxButton *dateButton = nullptr;
+#if defined(WIN32) || defined(__APPLE__)
+		frmCalendarSelectMonth *moo = nullptr;
+#else
+		XCCalendarMonthSelect *moo = nullptr;
+#endif
 		XCCalendarList *calendarList = nullptr;
 		CalendarDataStorage *dataStorage = nullptr;
-		int Month = 0;
-		int Year = 2016;
-		wxBitmap NextIconBitmap;
-		wxBitmap PreviousIconBitmap;
-		wxBitmap CalendarsIconBitmap;
+		int month = 0;
+		int year = 2016;
+		wxBitmap nextIconBitmap;
+		wxBitmap previousIconBitmap;
+		wxBitmap calendarsIconBitmap;
+#if defined(__APPLE__)
+        bool calendarListShow = false;
+#endif
 	
 		void UpdateDateButtonText();
 	protected:
-		void DateTextMouseover(wxMouseEvent &event);
-		void DateTextMouseout(wxMouseEvent &event);
+		void ButtonMouseover(wxMouseEvent &event);
+		void ButtonMouseout(wxMouseEvent &event);
 		void DateTextClick(wxCommandEvent &event);
 		void ChangeGrid(wxCommandEvent &event);
 		void NextMonth(wxCommandEvent &event);
@@ -65,9 +77,9 @@ class XCCalendarManipulator: public wxPanel
 		~XCCalendarManipulator();
 		int GetMonth();
 		int GetYear();
-	
-	DECLARE_EVENT_TABLE()
+		std::vector<int> GetHiddenAccountsList();
+		std::vector<int> GetHiddenCalendarsList();
 	
 };
 
-#endif
\ No newline at end of file
+#endif