Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -232,7 +232,7 @@ namespace ikvm.awt
public override void clipRect(int x, int y, int w, int h)
{
checkState();
base.clearRect(x, y, w, h);
base.clipRect(x, y, w, h);
}
public override void clip(java.awt.Shape shape)
@@ -1963,7 +1963,7 @@ namespace ikvm.awt
public override java.awt.Color getBackground()
{
return bgcolor == Color.Empty ? null : new java.awt.Color(color.ToArgb(), true);
return bgcolor == Color.Empty ? null : new java.awt.Color(bgcolor.ToArgb(), true);
}
public override java.awt.Stroke getStroke()

View File

@@ -1 +1 @@
a963d4472d2d9b541b71be3d73cec57c17f4cbb3
a8a055aaac9ad8e98b1c9c47fcd85f5d82ba8ef1