2005-04-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Calendar.cs: OnDayRender can toggle IsSelectable on our back.

svn path=/trunk/mcs/; revision=43800

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
index db5a726c9c4af1732bc3cd93b011138392cd9033..165f54820c28e655cc59f7f03345b09133a5bd11 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
@@ -1070,7 +1070,7 @@ namespace System.Web.UI.WebControls
                                        dayCell.Controls.Add (number);
                                        calDay.IsSelectable = isActive;
                                        OnDayRender (dayCell, calDay);
-                                       if (isActive)
+                                       if (calDay.IsSelectable)
                                                number.Text = GetCalendarLinkText ((begin + (crr * 7 + weekDay)).ToString (),
                                                                        dayString,
                                                                        currentDay.ToShortDateString (),

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 476fb44218f2bcf2663e7a46bb9a6d72f597a55a..b2508ead98eb0201eff15d510f9b87576d97be4c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * Calendar.cs: OnDayRender can toggle IsSelectable on our back.
+
 2005-04-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * Calendar.cs: when the day is active, modify the text of the literal