From 4d6e9ec212cd74fd157a231b37539076a538ca82 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Thu, 20 Jul 2017 21:40:50 +0100 Subject: [PATCH] XCCalendarMonthView: Removed second constructor (not needed) --- source/widgets/XCCalendarMonthView.cpp | 46 -------------------------- source/widgets/XCCalendarMonthView.h | 1 - 2 files changed, 47 deletions(-) diff --git a/source/widgets/XCCalendarMonthView.cpp b/source/widgets/XCCalendarMonthView.cpp index d962006..6f801e5 100644 --- a/source/widgets/XCCalendarMonthView.cpp +++ b/source/widgets/XCCalendarMonthView.cpp @@ -93,52 +93,6 @@ XCCalendarMonthView::XCCalendarMonthView(wxWindow *parent, const wxString& title Bind(XCCALENDARMONTH_UPDATECALENDARCOLOUR, &XCCalendarMonthView::UpdateCalendarColour, this, ID_UPDATECOLOUR); } -XCCalendarMonthView::XCCalendarMonthView(XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector *hideAccounts, std::vector *hideCalendars) - : wxPanel(NULL, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL){ - - Connect(ID_MONTHVIEWCLEARSELECTION, XCCALENDARMONTH_DESELECTOTHERENTRIES, wxCommandEventHandler(XCCalendarMonthView::DeselectOthersEvent)); - - calendarStorage = dataStorage; - - mondayText = new XCCalendarMonthViewDayTitle(this, _("Monday"), wxDefaultPosition, wxDefaultSize); - tuesdayText = new XCCalendarMonthViewDayTitle(this, _("Tuesday"), wxDefaultPosition, wxDefaultSize); - wednesdayText = new XCCalendarMonthViewDayTitle(this, _("Wednesday"), wxDefaultPosition, wxDefaultSize); - thursdayText = new XCCalendarMonthViewDayTitle(this, _("Thursday"), wxDefaultPosition, wxDefaultSize); - fridayText = new XCCalendarMonthViewDayTitle(this, _("Friday"), wxDefaultPosition, wxDefaultSize); - saturdayText = new XCCalendarMonthViewDayTitle(this, _("Saturday"), wxDefaultPosition, wxDefaultSize); - sundayText = new XCCalendarMonthViewDayTitle(this, _("Sunday"), wxDefaultPosition, wxDefaultSize); - - windowSizer->Add(mondayText, 1, wxEXPAND|wxALL, 0); - windowSizer->Add(tuesdayText, 1, wxEXPAND|wxALL, 0); - windowSizer->Add(wednesdayText, 1, wxEXPAND|wxALL, 0); - windowSizer->Add(thursdayText, 1, wxEXPAND|wxALL, 0); - windowSizer->Add(fridayText, 1, wxEXPAND|wxALL, 0); - windowSizer->Add(saturdayText, 1, wxEXPAND|wxALL, 0); - windowSizer->Add(sundayText, 1, wxEXPAND|wxALL, 0); - - ProcessGrid(grid, hideAccounts, hideCalendars); - - // Setup the days. - - // Setup the growable rows and columns. - - windowSizer->AddGrowableCol(0); - windowSizer->AddGrowableCol(1); - windowSizer->AddGrowableCol(2); - windowSizer->AddGrowableCol(3); - windowSizer->AddGrowableCol(4); - windowSizer->AddGrowableCol(5); - windowSizer->AddGrowableCol(6); - windowSizer->SetFlexibleDirection( wxBOTH ); - windowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - this->SetSizer(windowSizer); - windowSizer->Fit(this); - this->Layout(); - this->SetBackgroundColour(wxColour(0,0,0)); - -} - XCCalendarMonthView::~XCCalendarMonthView(){ delete mondayText; diff --git a/source/widgets/XCCalendarMonthView.h b/source/widgets/XCCalendarMonthView.h index 837a166..5eb3253 100644 --- a/source/widgets/XCCalendarMonthView.h +++ b/source/widgets/XCCalendarMonthView.h @@ -70,7 +70,6 @@ class XCCalendarMonthView: public wxPanel public: XCCalendarMonthView(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector *hideAccounts, std::vector *hideCalendars); - XCCalendarMonthView(XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector *hideAccounts, std::vector *hideCalendars); ~XCCalendarMonthView(); void ResizeFrameEvent(wxSizeEvent &sizeEvent); -- 2.39.5