Fixed PrepareControlHierarchyForItem().

The Header or Footer Style shouldn't merge with the cells Style.

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

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,7 @@
+2004-1-1 Alon Gazit <[email protected]>
+	* DataGrid.cs: Fixed PrepareControlHierarchyForItem().
+	The Header or Footer Style shouldn't merge with the cells Style.	  	 
+	
 2004-1-1 Alon Gazit <[email protected]>
 	* DataGridColumn.cs: Headers and Footers are initialized  
 	with the relevant Style object.	 

mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs

@@ -958,7 +958,7 @@ namespace System.Web.UI.WebControls
 				if (headerStyle != null)
 					item.MergeStyle (headerStyle);
 
-				goto case ListItemType.Separator;
+				break;
 			case ListItemType.Footer:
 				if (!ShowFooter) {
 					item.Visible = false;
@@ -968,7 +968,7 @@ namespace System.Web.UI.WebControls
 				if (footerStyle != null)
 					item.MergeStyle (footerStyle);
 
-				goto case ListItemType.Separator;
+				break;
 			case ListItemType.Item  :
 				item.MergeStyle (itemStyle);
 				goto case ListItemType.Separator;