macOS: Implemented macOS specific paths and variable name fixes

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

diff --git a/source/widgets/XCCalendarManipulator.h b/source/widgets/XCCalendarManipulator.h
index 81fd20a..83365e6 100644 (file)
--- 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"
@@ -39,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);
@@ -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