diff options
| author | Marek Safar <marek.safar@gmail.com> | 2014-01-04 14:05:03 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2014-01-04 14:05:03 +0400 |
| commit | 1913a6900b71d7499a9ab485845ac1819a079128 (patch) | |
| tree | 12c5e80ddf137402a8cb0a9db9adc05403d3ca93 /mcs/class | |
| parent | 996a249ff296edb2d0872045e24b6c47e2dfeec9 (diff) | |
| parent | 21bc38b80d6f6ebb1a1696e0cd72b4fcd7268cc5 (diff) | |
Merge pull request #858 from madewokherd/datavis
System.Windows.Forms.DataVisualization fixes
Diffstat (limited to 'mcs/class')
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs b/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs index 4df5319b935..da73c9fd9c8 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs @@ -50,7 +50,7 @@ using System.Runtime.InteropServices; [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/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.Charting/Chart.cs b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.Charting/Chart.cs index af2c3471f71..95c8d6c28a2 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.Charting/Chart.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.Charting/Chart.cs @@ -63,7 +63,7 @@ namespace System.Windows.Forms.DataVisualization.Charting 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;} |