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 4e5bb7e..83365e6 100644 (file)
--- a/source/widgets/XCCalendarManipulator.h
+++ b/source/widgets/XCCalendarManipulator.h
@@ -27,7 +27,7 @@
 #include <wx/mstream.h>
 
 #include "events.h"
 #include <wx/mstream.h>
 
 #include "events.h"

-#if defined(WIN32)
+#if defined(WIN32) || defined(__APPLE__)

 #include "../forms/calendarselectmonth/frmCalendarSelectMonth.h"
 #else
 #include "XCCalendarMonthSelect.h"
 #include "../forms/calendarselectmonth/frmCalendarSelectMonth.h"
 #else
 #include "XCCalendarMonthSelect.h"


@@ -47,7 +47,7 @@ class XCCalendarManipulator: public wxPanel
                wxButton *nextButton = nullptr;
                wxButton *calendarsButton = nullptr;
                wxButton *dateButton = nullptr;
                wxButton *nextButton = nullptr;
                wxButton *calendarsButton = nullptr;
                wxButton *dateButton = nullptr;

-#if defined(WIN32)
+#if defined(WIN32) || defined(__APPLE__)

                frmCalendarSelectMonth *moo = nullptr;
 #else
                XCCalendarMonthSelect *moo = nullptr;
                frmCalendarSelectMonth *moo = nullptr;
 #else
                XCCalendarMonthSelect *moo = nullptr;


@@ -59,6 +59,9 @@ class XCCalendarManipulator: public wxPanel
                wxBitmap nextIconBitmap;
                wxBitmap previousIconBitmap;
                wxBitmap calendarsIconBitmap;
                wxBitmap nextIconBitmap;
                wxBitmap previousIconBitmap;
                wxBitmap calendarsIconBitmap;

+#if defined(__APPLE__)
+        bool calendarListShow = false;
+#endif

        
                void UpdateDateButtonText();
        protected:
        
                void UpdateDateButtonText();
        protected:


@@ -79,4 +82,4 @@ class XCCalendarManipulator: public wxPanel
        
 };
 
        
 };
 

-#endif
\ No newline at end of file
+#endif