Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30198/src/Spring/Spring.Web/Web/UI/Controls
Modified Files:
Panel.cs
Log Message:
fix for SPRNET-794
Index: Panel.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Panel.cs 2 Feb 2008 16:31:08 -0000 1.1
--- Panel.cs 3 Feb 2008 21:38:27 -0000 1.2
***************
*** 28,31 ****
--- 28,32 ----
using System.Web.UI.HtmlControls;
using Spring.Context;
+ using Spring.Context.Support;
using Spring.Util;
using Spring.Web.Support;
***************
*** 119,122 ****
--- 120,139 ----
}
+ /// <summary>
+ /// Overridden to automatically aquire a reference to
+ /// root application context to use for DI.
+ /// </summary>
+ protected override ControlCollection CreateControlCollection()
+ {
+ // set root application context to signal, that we care
+ // for our children ourselves
+ if (_suppressDependencyInjection)
+ {
+ _defaultApplicationContext = WebApplicationContext.GetRootContext();
+ }
+
+ return base.CreateControlCollection();
+ }
+
#endregion Dependency Injection Support
}
|