Improved the logic used to determine when a calendar

Improved the logic used to determine when a calendar
month view needs to display 42 boxes instead of 35.  Some months
were displaying a spurious fifth row containing only the next
month or, even worse, a row with a single box for the last day
of the month.