2008-11-18 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.Web / System.Web.Compilation / ThemeDirectoryCompiler.cs

diff --git a/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs
index 91399c36327a3a9cc54ecc2e22605f9d65735f0d..a1fc894da6637c0f0528df7a63022f33891df859 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs
@@ -53,19 +53,25 @@ namespace System.Web.UI
                        
                        string[] css_files = Directory.GetFiles (physicalPath, "*.css");
                        string[] css_urls = new string[css_files.Length];
-                       for (int i = 0; i < css_files.Length; i++)
+                       for (int i = 0; i < css_files.Length; i++) {
+                               ptp.AddDependency (css_files [i]);
                                css_urls [i] = virtualPath + Path.GetFileName (css_files [i]);
+                       }
                        ptp.LinkedStyleSheets = css_urls;
                        
+                       AspComponentFoundry shared_foundry = new AspComponentFoundry ();
                        ptp.RootBuilder = new RootBuilder ();
 
+                       string skin_file_url;
                        for (int i = 0; i < skin_files.Length; i ++) {
-                               string skin_file_url = UrlUtils.Combine (physicalPath, Path.GetFileName (skin_files [i]));
+                               skin_file_url = VirtualPathUtility.Combine (virtualPath, Path.GetFileName (skin_files [i]));
                                PageThemeFileParser ptfp = new PageThemeFileParser (skin_file_url,
-                                                                                  skin_files[i],
-                                                                                  context);
+                                                                                   skin_files[i],
+                                                                                   context);
 
+                               ptp.AddDependency (skin_files [i]);
                                AspGenerator gen = new AspGenerator (ptfp);
+                               ptfp.RootBuilder.Foundry = shared_foundry;
                                gen.Parse ();
 
                                if (ptfp.RootBuilder.Children != null)