2004-05-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Calendar.cs: fire OnDayRender after assigning the calendar cell text.
	Fixes bug #58097.

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

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 86810c0343b8eccca59f0aec87ae6046a2ef8fbb..f5e10d2e47d93be1657c94bfd72410d6911caa90 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
@@ -6,7 +6,7 @@
 //   Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
 //
-// (c) 2002 Ximian, Inc. (http://www.ximian.com)
+// (c) Copyright 2002 Ximian, Inc. (http://www.ximian.com)
 // (C) Gaurav Vaish (2002)
 // (C) 2003 Andreas Nahr
 //\r
@@ -914,7 +914,6 @@ namespace System.Web.UI.WebControls
                                        dayCell.ApplyStyle (currentDayStyle);
                                        dayCell.Controls.Add (new LiteralControl (dayString));
                                        calDay.IsSelectable = isActive;
-                                       OnDayRender (dayCell, calDay);
                                        if (calDay.IsSelectable)
                                                dayCell.Text = GetCalendarLinkText (
                                                                        (begin + (crr * 7 + weekDay)).ToString (),
@@ -922,6 +921,7 @@ namespace System.Web.UI.WebControls
                                                                        dayCell.ForeColor,
                                                                        isActive);
 
+                                       OnDayRender (dayCell, calDay);
                                        dayCell.RenderControl (writer);
 
                                        currentDay = globCal.AddDays (currentDay, 1);\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 6b0079363af708e905e340b58e13767956718ee8..8aadd691775e8f2e469fcffe368fb13cc8b58aaa 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,8 @@
+2004-05-14  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * Calendar.cs: fire OnDayRender after assigning the calendar cell text.
+       Fixes bug #58097.
+
 2004-05-09 Gert Driesen (drieseng@users.sourceforge.net)
        * Parameter.cs: 
        * SqlDataSourceCommandEventArgs: