X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarMonthView.h;h=35e2054b517fb79370c78f5f66b49822c3efaa89;hp=db4962fb9fd9b6076432271f5a358ccab47ac10d;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=cba151c4b833a26c63984769f921bab5e755decd diff --git a/source/widgets/XCCalendarMonthView.h b/source/widgets/XCCalendarMonthView.h index db4962f..35e2054 100644 --- a/source/widgets/XCCalendarMonthView.h +++ b/source/widgets/XCCalendarMonthView.h @@ -41,23 +41,20 @@ class XCCalendarMonthView: public wxPanel { private: - wxFlexGridSizer *WindowSizer = new wxFlexGridSizer(0, 7, 1, 1); - vector CalendarDayList; - wxStaticText *NumberText = nullptr; - XCCalendarMonthViewDayTitle *MondayText = nullptr; - XCCalendarMonthViewDayTitle *TuesdayText = nullptr; - XCCalendarMonthViewDayTitle *WednesdayText = nullptr; - XCCalendarMonthViewDayTitle *ThursdayText = nullptr; - XCCalendarMonthViewDayTitle *FridayText = nullptr; - XCCalendarMonthViewDayTitle *SaturdayText = nullptr; - XCCalendarMonthViewDayTitle *SundayText = nullptr; + wxFlexGridSizer *windowSizer = new wxFlexGridSizer(0, 7, 1, 1); + vector calendarDayList; + XCCalendarMonthViewDayTitle *mondayText = nullptr; + XCCalendarMonthViewDayTitle *tuesdayText = nullptr; + XCCalendarMonthViewDayTitle *wednesdayText = nullptr; + XCCalendarMonthViewDayTitle *thursdayText = nullptr; + XCCalendarMonthViewDayTitle *fridayText = nullptr; + XCCalendarMonthViewDayTitle *saturdayText = nullptr; + XCCalendarMonthViewDayTitle *sundayText = nullptr; XCEventMenu *eventMenu = nullptr; CalendarDataStorage *calendarStorage = nullptr; void ProcessGrid(XCCalendarMonthViewGrid *grid, std::vector *hideAccounts, std::vector *hideCalendars); - void Repaint(); - protected: void HideAccountEntries(wxCommandEvent &accountData); void ShowAccountEntries(wxCommandEvent &accountData); @@ -72,12 +69,10 @@ 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 PaintFrameEvent(wxPaintEvent &PaintEvent); - void ResizeFrameEvent(wxSizeEvent &SizeEvent); - void DeselectOthersEvent(wxCommandEvent &DeselectEvent); + + void ResizeFrameEvent(wxSizeEvent &sizeEvent); + void DeselectOthersEvent(wxCommandEvent &deselectEvent); DECLARE_EVENT_TABLE()