projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow mono-wrapper executable to be overridden by environment
[mono.git]
/
mcs
/
class
/
System.Drawing
/
System.Drawing
/
PointF.cs
diff --git
a/mcs/class/System.Drawing/System.Drawing/PointF.cs
b/mcs/class/System.Drawing/System.Drawing/PointF.cs
index e829c6a7905c308d0b5fdb533a9436f12acdef18..1a64613aa24992e4a43ab2d974b57a8c6a68016a 100644
(file)
--- a/
mcs/class/System.Drawing/System.Drawing/PointF.cs
+++ b/
mcs/class/System.Drawing/System.Drawing/PointF.cs
@@
-68,12
+68,10
@@
namespace System.Drawing
{
return new PointF (pt.X + sz.Width, pt.Y + sz.Height);
}
{
return new PointF (pt.X + sz.Width, pt.Y + sz.Height);
}
-#if NET_2_0
public static PointF operator + (PointF pt, SizeF sz)
{
return new PointF (pt.X + sz.Width, pt.Y + sz.Height);
}
public static PointF operator + (PointF pt, SizeF sz)
{
return new PointF (pt.X + sz.Width, pt.Y + sz.Height);
}
-#endif
/// <summary>
/// Equality Operator
/// <summary>
/// Equality Operator
@@
-85,9
+83,9
@@
namespace System.Drawing
/// of the two points.
/// </remarks>
/// of the two points.
/// </remarks>
- public static bool operator == (PointF
pt_a, PointF pt_b
)
+ public static bool operator == (PointF
left, PointF right
)
{
{
- return ((
pt_a.X == pt_b.X) && (pt_a.Y == pt_b
.Y));
+ return ((
left.X == right.X) && (left.Y == right
.Y));
}
/// <summary>
}
/// <summary>
@@
-100,9
+98,9
@@
namespace System.Drawing
/// of the two points.
/// </remarks>
/// of the two points.
/// </remarks>
- public static bool operator != (PointF
pt_a, PointF pt_b
)
+ public static bool operator != (PointF
left, PointF right
)
{
{
- return ((
pt_a.X != pt_b.X) || (pt_a.Y != pt_b
.Y));
+ return ((
left.X != right.X) || (left.Y != right
.Y));
}
/// <summary>
}
/// <summary>
@@
-118,12
+116,10
@@
namespace System.Drawing
{
return new PointF (pt.X - sz.Width, pt.Y - sz.Height);
}
{
return new PointF (pt.X - sz.Width, pt.Y - sz.Height);
}
-#if NET_2_0
public static PointF operator - (PointF pt, SizeF sz)
{
return new PointF (pt.X - sz.Width, pt.Y - sz.Height);
}
public static PointF operator - (PointF pt, SizeF sz)
{
return new PointF (pt.X - sz.Width, pt.Y - sz.Height);
}
-#endif
// -----------------------
// Public Constructor
// -----------------------
// Public Constructor
@@
-204,12
+200,12
@@
namespace System.Drawing
/// Checks equivalence of this PointF and another object.
/// </remarks>
/// Checks equivalence of this PointF and another object.
/// </remarks>
- public override bool Equals (object o)
+ public override bool Equals (object o
bj
)
{
{
- if (!(o is PointF))
+ if (!(o
bj
is PointF))
return false;
return false;
- return (this == (PointF) o);
+ return (this == (PointF) o
bj
);
}
/// <summary>
}
/// <summary>
@@
-239,7
+235,6
@@
namespace System.Drawing
y.ToString (CultureInfo.CurrentCulture));
}
y.ToString (CultureInfo.CurrentCulture));
}
-#if NET_2_0
public static PointF Add (PointF pt, Size sz)
{
return new PointF (pt.X + sz.Width, pt.Y + sz.Height);
public static PointF Add (PointF pt, Size sz)
{
return new PointF (pt.X + sz.Width, pt.Y + sz.Height);
@@
-259,7
+254,6
@@
namespace System.Drawing
{
return new PointF (pt.X - sz.Width, pt.Y - sz.Height);
}
{
return new PointF (pt.X - sz.Width, pt.Y - sz.Height);
}
-#endif
}
}
}
}