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

diff --git a/source/widgets/XCCalendarManipulator.h b/source/widgets/XCCalendarManipulator.h
index 01968a2..83365e6 100644
--- a/source/widgets/XCCalendarManipulator.h
+++ b/source/widgets/XCCalendarManipulator.h
@@ -27,7 +27,11 @@
 #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"
@@ -43,7 +47,11 @@ class XCCalendarManipulator: public wxPanel
 		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;
@@ -51,11 +59,14 @@ class XCCalendarManipulator: public wxPanel
 		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);
@@ -69,8 +80,6 @@ class XCCalendarManipulator: public wxPanel
 		std::vector<int> GetHiddenAccountsList();
 		std::vector<int> GetHiddenCalendarsList();
 	
-	DECLARE_EVENT_TABLE()
-	
 };
 
-#endif
\ No newline at end of file
+#endif