зеркало из https://github.com/mono/ikvm-fork.git
Updated to compile with Classpath HEAD again.
This commit is contained in:
Родитель
a1b74645cb
Коммит
fef5a8394d
|
@ -161,7 +161,7 @@ namespace ikvm.awt
|
|||
netFont = J2C.ConvertFont(name, getStyle(null), getSize(null));
|
||||
}
|
||||
|
||||
public override bool canDisplay(java.awt.Font font, char param2)
|
||||
public override bool canDisplay(java.awt.Font font, int param2)
|
||||
{
|
||||
//HACK There is no equivalent in C# http://msdn2.microsoft.com/en-us/library/sf4dhbw8(VS.80).aspx
|
||||
return true;
|
||||
|
|
|
@ -42,6 +42,10 @@ namespace ikvm.awt
|
|||
screen = ((NetGraphicsDevice)device).screen;
|
||||
}
|
||||
|
||||
public void dispose()
|
||||
{
|
||||
}
|
||||
|
||||
public int getRGBPixel(int x, int y)
|
||||
{
|
||||
#if WHIDBEY
|
||||
|
|
|
@ -54,6 +54,7 @@ namespace ikvm.awt
|
|||
delegate java.awt.Dimension GetDimension();
|
||||
delegate Rectangle ConvertRectangle(Rectangle r);
|
||||
delegate Point ConvertPoint(Point p);
|
||||
delegate object GetObject();
|
||||
|
||||
class UndecoratedForm : Form
|
||||
{
|
||||
|
@ -529,6 +530,18 @@ namespace ikvm.awt
|
|||
{
|
||||
return new NetDesktopPeer();
|
||||
}
|
||||
|
||||
public override bool isModalExclusionTypeSupported(java.awt.Dialog.ModalExclusionType modalExclusionType)
|
||||
{
|
||||
// TODO
|
||||
return false;
|
||||
}
|
||||
|
||||
public override bool isModalityTypeSupported(java.awt.Dialog.ModalityType modalityType)
|
||||
{
|
||||
// TODO
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
class NetLightweightComponentPeer : NetComponentPeer, java.awt.peer.LightweightPeer
|
||||
|
@ -1081,6 +1094,11 @@ namespace ikvm.awt
|
|||
control.Focus();
|
||||
}
|
||||
|
||||
public bool requestFocus(java.awt.Component request, bool temporary, bool allowWindowFocus, long time, sun.awt.CausedFocusEvent.Cause cause)
|
||||
{
|
||||
return requestFocus(request, temporary, allowWindowFocus, time);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
@ -1833,6 +1851,31 @@ namespace ikvm.awt
|
|||
{
|
||||
return control.Focus();
|
||||
}
|
||||
|
||||
public void setAlwaysOnTop(bool alwaysOnTop)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void updateFocusableWindowState()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void setModalBlocked(java.awt.Dialog blocker, bool blocked)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void updateMinimumSize()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void updateIconImages()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
class NetFramePeer : NetWindowPeer, FramePeer
|
||||
|
@ -1928,10 +1971,25 @@ namespace ikvm.awt
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
private void SetBoundsImpl(int x, int y, int width, int height)
|
||||
{
|
||||
control.Bounds = new Rectangle(x, y, width, height);
|
||||
}
|
||||
|
||||
public void setBoundsPrivate(int x, int y, int width, int height)
|
||||
{
|
||||
// TODO use control.Invoke
|
||||
control.Bounds = new Rectangle(x, y, width, height);
|
||||
control.Invoke(new SetXYWH(SetBoundsImpl), x, y, width, height);
|
||||
}
|
||||
|
||||
private object GetBoundsImpl()
|
||||
{
|
||||
Rectangle r = control.Bounds;
|
||||
return new java.awt.Rectangle(r.Left, r.Top, r.Width, r.Height);
|
||||
}
|
||||
|
||||
public java.awt.Rectangle getBoundsPrivate()
|
||||
{
|
||||
return (java.awt.Rectangle)control.Invoke(new GetObject(GetBoundsImpl));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4940,6 +4940,7 @@
|
|||
../../classpath/org/omg/SendingContext/RunTime.java
|
||||
../../classpath/org/omg/SendingContext/RunTimeOperations.java
|
||||
../../classpath/org/omg/stub/java/rmi/_Remote_Stub.java
|
||||
../../classpath/sun/awt/CausedFocusEvent.java
|
||||
../../classpath/sun/misc/Service.java
|
||||
../../classpath/sun/misc/ServiceConfigurationError.java
|
||||
../../classpath/sun/reflect/annotation/AnnotationInvocationHandler.java
|
||||
|
|
|
@ -4343,6 +4343,7 @@
|
|||
../../classpath/org/omg/SendingContext/RunTime.java
|
||||
../../classpath/org/omg/SendingContext/RunTimeOperations.java
|
||||
../../classpath/org/omg/stub/java/rmi/_Remote_Stub.java
|
||||
../../classpath/sun/awt/CausedFocusEvent.java
|
||||
../classpath/gnu/classpath/Configuration.java
|
||||
../classpath/gnu/classpath/PointerUtil.java
|
||||
../classpath/gnu/classpath/VMStackWalker.java
|
||||
|
|
Загрузка…
Ссылка в новой задаче