Menu
▾
▴
[Nplot-devel] SF.net SVN: nplot: [17] trunk/src
|
From: <an...@us...> - 2006-12-28 09:32:49
|
Revision: 17
http://svn.sourceforge.net/nplot/?rev=17&view=rev
Author: anmar
Date: 2006-12-28 01:32:48 -0800 (Thu, 28 Dec 2006)
Log Message:
-----------
Fixed [SF bug 1622918]
Padding is a new property for System.Windows.Forms.Control in .NET 2.0 so NPlot.Windows.PlotSurface2D was hiding it. It has been renamed to SurfacePadding and kept as an obsolete property for .NET 1.1 builds for backwards compatibility.
* [src/IPlotSurface2D.cs] Rename Padding to SurfacePadding
* [src/PlotSurface2D.cs] Rename Padding to SurfacePadding and make Padding an obsolete alias to SurfacePadding that is only compiled for .NET 1.1
* [src/Bitmap.PlotSurface2D.cs] Rename Padding to SurfacePadding and make Padding an obsolete alias to SurfacePadding that is only compiled for .NET 1.1
* [src/Web.PlotSurface2D.cs] Rename Padding to SurfacePadding and make Padding an obsolete alias to SurfacePadding that is only compiled for .NET 1.1
* [src/Windows.PlotSurface2D.cs] Rename Padding to SurfacePadding and make Padding an obsolete alias to SurfacePadding that is only compiled for .NET 1.1
Signed off by: anmar
Modified Paths:
--------------
trunk/src/Bitmap.PlotSurface2D.cs
trunk/src/IPlotSurface2D.cs
trunk/src/PlotSurface2D.cs
trunk/src/Web.PlotSurface2D.cs
trunk/src/Windows.PlotSurface2D.cs
Modified: trunk/src/Bitmap.PlotSurface2D.cs
===================================================================
--- trunk/src/Bitmap.PlotSurface2D.cs 2006-12-28 09:14:03 UTC (rev 16)
+++ trunk/src/Bitmap.PlotSurface2D.cs 2006-12-28 09:32:48 UTC (rev 17)
@@ -168,21 +168,38 @@
ps_.TitleFont = value;
}
}
-
-
+#if API_1_1
/// <summary>
+ /// It has been renamed to <see cref="SurfacePadding" /> and can be used with .NET 1.1 only.
+ /// </summary>
+ [
+ Obsolete("This property is only maintained in .NET 1.1 profile for compatibility, but it might be removed in the future. Use SurfacePadding instead")
+ ]
+ public int Padding
+ {
+ get
+ {
+ return SurfacePadding;
+ }
+ set
+ {
+ SurfacePadding = value;
+ }
+ }
+#endif
+ /// <summary>
/// The distance in pixels to leave between of the edge of the bounding rectangle
/// supplied to the Draw method, and the markings that make up the plot.
/// </summary>
- public int Padding
+ public int SurfacePadding
{
get
{
- return ps_.Padding;
+ return ps_.SurfacePadding;
}
set
{
- ps_.Padding = value;
+ ps_.SurfacePadding = value;
}
}
Modified: trunk/src/IPlotSurface2D.cs
===================================================================
--- trunk/src/IPlotSurface2D.cs 2006-12-28 09:14:03 UTC (rev 16)
+++ trunk/src/IPlotSurface2D.cs 2006-12-28 09:32:48 UTC (rev 17)
@@ -102,7 +102,7 @@
/// The distance in pixels to leave between of the edge of the bounding rectangle
/// supplied to the Draw method, and the markings that make up the plot.
/// </summary>
- int Padding { get; set; }
+ int SurfacePadding { get; set; }
/// <summary>
Modified: trunk/src/PlotSurface2D.cs
===================================================================
--- trunk/src/PlotSurface2D.cs 2006-12-28 09:14:03 UTC (rev 16)
+++ trunk/src/PlotSurface2D.cs 2006-12-28 09:32:48 UTC (rev 17)
@@ -333,12 +333,30 @@
}
}
-
+#if API_1_1
/// <summary>
+ /// It has been renamed to <see cref="SurfacePadding" /> and can be used with .NET 1.1 only.
+ /// </summary>
+ [
+ Obsolete("This property is only maintained in .NET 1.1 profile for compatibility, but it might be removed in the future. Use SurfacePadding instead")
+ ]
+ public int Padding
+ {
+ get
+ {
+ return SurfacePadding;
+ }
+ set
+ {
+ SurfacePadding = value;
+ }
+ }
+#endif
+ /// <summary>
/// The distance in pixels to leave between of the edge of the bounding rectangle
/// supplied to the Draw method, and the markings that make up the plot.
/// </summary>
- public int Padding
+ public int SurfacePadding
{
get
{
Modified: trunk/src/Web.PlotSurface2D.cs
===================================================================
--- trunk/src/Web.PlotSurface2D.cs 2006-12-28 09:14:03 UTC (rev 16)
+++ trunk/src/Web.PlotSurface2D.cs 2006-12-28 09:32:48 UTC (rev 17)
@@ -192,8 +192,29 @@
}
}
-
+#if API_1_1
/// <summary>
+ /// It has been renamed to <see cref="SurfacePadding" /> and can be used with .NET 1.1 only.
+ /// </summary>
+ [
+ Browsable(true),
+ Category("Data"),
+ Bindable(true),
+ Obsolete("This property is only maintained in .NET 1.1 profile for compatibility, but it might be removed in the future. Use SurfacePadding instead")
+ ]
+ public int Padding
+ {
+ get
+ {
+ return SurfacePadding;
+ }
+ set
+ {
+ SurfacePadding = value;
+ }
+ }
+#endif
+ /// <summary>
/// The distance in pixels to leave between of the edge of the bounding rectangle
/// supplied to the Draw method, and the markings that make up the plot.
/// </summary>
@@ -202,15 +223,15 @@
Category("Data"),
Bindable(true)
]
- public int Padding
+ public int SurfacePadding
{
get
{
- return ps_.Padding;
+ return ps_.SurfacePadding;
}
set
{
- ps_.Padding = value;
+ ps_.SurfacePadding = value;
}
}
Modified: trunk/src/Windows.PlotSurface2D.cs
===================================================================
--- trunk/src/Windows.PlotSurface2D.cs 2006-12-28 09:14:03 UTC (rev 16)
+++ trunk/src/Windows.PlotSurface2D.cs 2006-12-28 09:32:48 UTC (rev 17)
@@ -434,8 +434,30 @@
}
}
-
+#if API_1_1
/// <summary>
+ /// It has been renamed to <see cref="SurfacePadding" /> and can be used with .NET 1.1 only.
+ /// </summary>
+ [
+ Category("PlotSurface2D"),
+ Description("See SurfacePadding."),
+ Browsable(true),
+ Bindable(true),
+ Obsolete("This property is only maintained in .NET 1.1 profile for compatibility, but it might be removed in the future. Use SurfacePadding instead")
+ ]
+ public int Padding
+ {
+ get
+ {
+ return SurfacePadding;
+ }
+ set
+ {
+ SurfacePadding = value;
+ }
+ }
+#endif
+ /// <summary>
/// Padding of this width will be left between what is drawn and the control border.
/// </summary>
[
@@ -444,19 +466,18 @@
Browsable(true),
Bindable(true)
]
- public int Padding
+ public int SurfacePadding
{
get
{
- return ps_.Padding;
+ return ps_.SurfacePadding;
}
set
{
- ps_.Padding = value;
+ ps_.SurfacePadding = value;
}
}
-
/// <summary>
/// The first abscissa axis.
/// </summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
