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
XCCalendarCtrl: Generate current month grid if no data is given
[xestiacalendar/.git]
/
source
/
widgets
/
XCCalendarCtrl.cpp
diff --git
a/source/widgets/XCCalendarCtrl.cpp
b/source/widgets/XCCalendarCtrl.cpp
index
893f150
..
2619242
100644
(file)
--- a/
source/widgets/XCCalendarCtrl.cpp
+++ b/
source/widgets/XCCalendarCtrl.cpp
@@
-18,11
+18,18
@@
#include "XCCalendarCtrl.h"
#include "XCCalendarCtrl.h"
+BEGIN_EVENT_TABLE(XCCalendarCtrl, wxPanel)
+END_EVENT_TABLE()
+
using namespace std;
XCCalendarCtrl::XCCalendarCtrl(wxWindow *parent, CalendarDataStorage *dataStorage)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize){
using namespace std;
XCCalendarCtrl::XCCalendarCtrl(wxWindow *parent, CalendarDataStorage *dataStorage)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize){
+ // Setup the pointers.
+
+ calendarStorage = dataStorage;
+
// Setup the main sizer.
szrMain = new wxFlexGridSizer(2, 1, 0, 0);
// Setup the main sizer.
szrMain = new wxFlexGridSizer(2, 1, 0, 0);
@@
-34,14
+41,18
@@
XCCalendarCtrl::XCCalendarCtrl(wxWindow *parent, CalendarDataStorage *dataStorag
// Setup the top menu.
// Setup the top menu.
- ManipulatorCtrl = new XCCalendarManipulator(this, "XCCalendarManipulator Test", wxDefaultPosition, wxDefaultSize,
data
Storage);
+ ManipulatorCtrl = new XCCalendarManipulator(this, "XCCalendarManipulator Test", wxDefaultPosition, wxDefaultSize,
calendar
Storage);
// Setup the month view grid.
// Setup the month view grid.
- XCCalendarMonthViewGrid CurrentMonthGrid = GenerateMonthGrid(11, 2016);
+ wxDateTime DTNow = wxDateTime::Now();
+ int currentMonth = ((int)DTNow.GetMonth() + 1);
+ int currentYear = DTNow.GetYear();
+
+ XCCalendarMonthViewGrid CurrentMonthGrid = GenerateMonthGrid(currentMonth, currentYear);
szrMain->Add(ManipulatorCtrl, 1, wxEXPAND, 5);
szrMain->Add(ManipulatorCtrl, 1, wxEXPAND, 5);
- MonthViewCtrl = new XCCalendarMonthView(this, "XCCalendarMonthView Test", wxDefaultPosition, wxDefaultSize, &CurrentMonthGrid);
+ MonthViewCtrl = new XCCalendarMonthView(this, "XCCalendarMonthView Test", wxDefaultPosition, wxDefaultSize, &CurrentMonthGrid
, calendarStorage
);
szrMain->Add(MonthViewCtrl, 1, wxEXPAND, 5);
Connect(wxID_ANY, XCCALENDARCTRL_CHANGEGRID, wxCommandEventHandler(XCCalendarCtrl::UpdateGrid));
szrMain->Add(MonthViewCtrl, 1, wxEXPAND, 5);
Connect(wxID_ANY, XCCALENDARCTRL_CHANGEGRID, wxCommandEventHandler(XCCalendarCtrl::UpdateGrid));
@@
-65,7
+76,7
@@
void XCCalendarCtrl::UpdateGrid(wxCommandEvent &event){
// Create a new grid.
XCCalendarMonthViewGrid NewGrid = GenerateMonthGrid(ManipulatorCtrl->GetMonth(), ManipulatorCtrl->GetYear());
// Create a new grid.
XCCalendarMonthViewGrid NewGrid = GenerateMonthGrid(ManipulatorCtrl->GetMonth(), ManipulatorCtrl->GetYear());
- MonthViewCtrl = new XCCalendarMonthView(this, _(""), wxDefaultPosition, wxDefaultSize, &NewGrid);
+ MonthViewCtrl = new XCCalendarMonthView(this, _(""), wxDefaultPosition, wxDefaultSize, &NewGrid
, calendarStorage
);
// Detach the old grid and attach the new one.
// Detach the old grid and attach the new one.
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy