Merge pull request #858 from madewokherd/datavis

System.Windows.Forms.DataVisualization fixes
mono · Jan 4, 2014 · 1913a69 · 1913a69
2 parents 996a249 + 21bc38b
commit 1913a69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs b/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs
@@ -50,7 +50,7 @@
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
+[assembly: AssemblyKeyFile ("../winfx.pub")]
 
 [assembly: SecurityRules (SecurityRuleSet.Level1)]
 

diff --git a/....Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.Charting/Chart.cs b/....Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.Charting/Chart.cs
@@ -63,7 +63,7 @@ public Chart ()
 		public ChartAreaCollection ChartAreas { get; private set; }
 		public DataManipulator DataManipulator { get; private set;}
 		public Object DataSource { get; set; }
-		protected override Size DefaultSize { get { return DefaultSize; } }//FIXME
+		protected override Size DefaultSize { get { return base.DefaultSize; } }//FIXME
 		public Font Font { get; set; }
 		public override Color ForeColor { get; set; }
 		public NamedImagesCollection Images { get; private set;}