Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiacalendar
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
a06c726
..
83365e6
100644
(file)
--- a/
source/widgets/XCCalendarManipulator.h
+++ b/
source/widgets/XCCalendarManipulator.h
@@
-27,7
+27,11
@@
#include <wx/mstream.h>
#include "events.h"
#include <wx/mstream.h>
#include "events.h"
+#if defined(WIN32) || defined(__APPLE__)
+#include "../forms/calendarselectmonth/frmCalendarSelectMonth.h"
+#else
#include "XCCalendarMonthSelect.h"
#include "XCCalendarMonthSelect.h"
+#endif
#include "XCCalendarList.h"
#include "../bitmaps.h"
#include "../libraries/CalendarDataStorage/CalendarDataStorage.h"
#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;
wxButton *nextButton = nullptr;
wxButton *calendarsButton = nullptr;
wxButton *dateButton = nullptr;
+#if defined(WIN32) || defined(__APPLE__)
+ frmCalendarSelectMonth *moo = nullptr;
+#else
XCCalendarMonthSelect *moo = nullptr;
XCCalendarMonthSelect *moo = nullptr;
+#endif
XCCalendarList *calendarList = nullptr;
CalendarDataStorage *dataStorage = nullptr;
int month = 0;
XCCalendarList *calendarList = nullptr;
CalendarDataStorage *dataStorage = nullptr;
int month = 0;
@@
-51,11
+59,14
@@
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:
- void
DateText
Mouseover(wxMouseEvent &event);
- void
DateText
Mouseout(wxMouseEvent &event);
+ void
Button
Mouseover(wxMouseEvent &event);
+ void
Button
Mouseout(wxMouseEvent &event);
void DateTextClick(wxCommandEvent &event);
void ChangeGrid(wxCommandEvent &event);
void NextMonth(wxCommandEvent &event);
void DateTextClick(wxCommandEvent &event);
void ChangeGrid(wxCommandEvent &event);
void NextMonth(wxCommandEvent &event);
@@
-71,4
+82,4
@@
class XCCalendarManipulator: public wxPanel
};
};
-#endif
\ No newline at end of file
+#endif
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy