X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarMonthView.cpp;h=d962006d1d6a766f45ac815cb9565ee415ce2cd1;hb=383faacc694d7c010e003456ce5c3d54cdad0778;hp=22ee98d2bfab563e094a70db527d42206c26c953;hpb=ca1d24d80ec04ae64a7540cf8bca61c053f2a193;p=xestiacalendar%2F.git diff --git a/source/widgets/XCCalendarMonthView.cpp b/source/widgets/XCCalendarMonthView.cpp index 22ee98d..d962006 100644 --- a/source/widgets/XCCalendarMonthView.cpp +++ b/source/widgets/XCCalendarMonthView.cpp @@ -33,7 +33,6 @@ wxDEFINE_EVENT(XCCALENDARMONTH_UPDATEENTRY, wxCommandEvent); wxDEFINE_EVENT(XCCALENDARMONTH_UPDATECALENDARCOLOUR, wxCommandEvent); BEGIN_EVENT_TABLE(XCCalendarMonthView, wxPanel) -EVT_PAINT(XCCalendarMonthView::PaintFrameEvent) END_EVENT_TABLE() XCCalendarMonthView::XCCalendarMonthView(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, XCCalendarMonthViewGrid *grid, CalendarDataStorage *dataStorage, std::vector *hideAccounts, std::vector *hideCalendars) @@ -81,7 +80,7 @@ XCCalendarMonthView::XCCalendarMonthView(wxWindow *parent, const wxString& title // Bind events to the control. - Bind(XCCALENDARMONTH_DELETECALENDARENTRIES, &XCCalendarMonthView::DeselectOthersEvent, this, ID_MONTHVIEWCLEARSELECTION); + Bind(XCCALENDARMONTH_DESELECTOTHERENTRIES, &XCCalendarMonthView::DeselectOthersEvent, this, ID_MONTHVIEWCLEARSELECTION); Bind(XCCALENDARMONTH_HIDEACCOUNTENTRIES, &XCCalendarMonthView::HideAccountEntries, this, ID_HIDEENTRIES); Bind(XCCALENDARMONTH_SHOWACCOUNTENTRIES, &XCCalendarMonthView::ShowAccountEntries, this, ID_SHOWENTRIES); Bind(XCCALENDARMONTH_HIDECALENDARENTRIES, &XCCalendarMonthView::HideCalendarEntries, this, ID_HIDECALENDARENTRIES); @@ -177,8 +176,8 @@ void XCCalendarMonthView::ProcessGrid(XCCalendarMonthViewGrid *grid, std::vector // Add Calendar entries. - XCCalendarDay *calendarDayItem = new XCCalendarDay(this, "XCCalendarMonthView Test", wxPoint(50, 50), wxSize(200, 200)); - + XCCalendarDay *calendarDayItem = new XCCalendarDay(this, "XCCalendarMonthView Test", wxPoint(50, 50), wxSize(100,100)); + // Setup the control. calendarDayItem->SetupControl((*dayIter).day, (*dayIter).month, (*dayIter).year, (*dayIter).isInMonth, this, calendarStorage, hideAccounts, hideCalendars); @@ -200,20 +199,6 @@ void XCCalendarMonthView::ProcessGrid(XCCalendarMonthViewGrid *grid, std::vector } -void XCCalendarMonthView::Repaint(){ - - // Draw the border. - - this->Layout(); - -} - -void XCCalendarMonthView::PaintFrameEvent(wxPaintEvent &PaintEvent){ - - Repaint(); - -} - void XCCalendarMonthView::ResizeFrameEvent(wxSizeEvent &SizeEvent){ // TODO: Check if window size is less than 120 pixels and if it is,