This commit is contained in:
jfrijters 2006-12-11 07:07:12 +00:00
Родитель 0f2afcc4d6
Коммит c1a7c0e94e
13 изменённых файлов: 4923 добавлений и 4871 удалений

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.31.*")] [assembly: AssemblyVersion("0.32.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -1557,7 +1557,15 @@ namespace ikvm.awt
{ {
if(control is Form) if(control is Form)
{ {
((Form)control).Owner = (Form)((NetComponentPeer)parent.getPeer()).control; NetComponentPeer parentPeer = (NetComponentPeer)parent.getPeer();
if(parentPeer != null)
{
((Form)control).Owner = (Form)parentPeer.control;
}
else
{
// TODO later on when the owner peer is created we should set our owner
}
} }
else else
{ {
@ -1571,7 +1579,7 @@ namespace ikvm.awt
control.Parent = ((NetComponentPeer)p.getPeer()).control; control.Parent = ((NetComponentPeer)p.getPeer()).control;
} }
} }
if(parent is java.awt.Frame) if(parent is java.awt.Frame && !(control is Form))
{ {
java.awt.Insets ins = ((NetFramePeer)parent.getPeer()).getInsets(); java.awt.Insets ins = ((NetFramePeer)parent.getPeer()).getInsets();
offsetX = -ins.left; offsetX = -ins.left;

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -4021,6 +4021,11 @@
../../classpath-0.93/javax/swing/text/html/parser/Parser.java ../../classpath-0.93/javax/swing/text/html/parser/Parser.java
../../classpath-0.93/javax/swing/text/html/parser/ParserDelegator.java ../../classpath-0.93/javax/swing/text/html/parser/ParserDelegator.java
../../classpath-0.93/javax/swing/text/html/parser/TagElement.java ../../classpath-0.93/javax/swing/text/html/parser/TagElement.java
../../classpath-0.93/javax/swing/text/html/ResetableModel.java
../../classpath-0.93/javax/swing/text/html/ResetablePlainDocument.java
../../classpath-0.93/javax/swing/text/html/ResetableToggleButtonModel.java
../../classpath-0.93/javax/swing/text/html/SelectComboBoxModel.java
../../classpath-0.93/javax/swing/text/html/SelectListModel.java
../../classpath-0.93/javax/swing/text/html/StyleSheet.java ../../classpath-0.93/javax/swing/text/html/StyleSheet.java
../../classpath-0.93/javax/swing/text/html/TableView.java ../../classpath-0.93/javax/swing/text/html/TableView.java
../../classpath-0.93/javax/swing/text/html/ViewAttributeSet.java ../../classpath-0.93/javax/swing/text/html/ViewAttributeSet.java

Просмотреть файл

@ -51,7 +51,7 @@
<arg value="-srcpath:/classpath/" /> <arg value="-srcpath:/classpath/" />
--> -->
<arg value="-nowarn:100:java.math.BigInteger$NativeMPI" /> <arg value="-nowarn:100:java.math.BigInteger$NativeMPI" />
<arg value="-version:0.31.*" /> <arg value="-version:0.32.0.0" />
<arg value="${signoption}" /> <arg value="${signoption}" />
<arg value="-compressresources" /> <arg value="-compressresources" />
<arg value="-opt:fields" /> <arg value="-opt:fields" />

Просмотреть файл

@ -45,7 +45,7 @@ public interface Configuration
{ {
// TODO // TODO
String CLASSPATH_HOME = ""; String CLASSPATH_HOME = "";
String CLASSPATH_VERSION = "0.92-generics-pre"; String CLASSPATH_VERSION = "0.93-generics";
/** /**

Просмотреть файл

@ -45,7 +45,7 @@ public interface Configuration
{ {
// TODO // TODO
String CLASSPATH_HOME = ""; String CLASSPATH_HOME = "";
String CLASSPATH_VERSION = "0.93-pre"; String CLASSPATH_VERSION = "0.93";
/** /**
@ -72,7 +72,7 @@ public interface Configuration
/** /**
* Name of default AWT peer library. * Name of default AWT peer library.
*/ */
String default_awt_peer_toolkit = "ikvm.awt.NetToolkit, IKVM.AWT.WinForms"; String default_awt_peer_toolkit = "ikvm.awt.NetToolkit, IKVM.AWT.WinForms, Version=0.32.0.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58";
boolean WANT_NATIVE_BIG_INTEGER = false; boolean WANT_NATIVE_BIG_INTEGER = false;
} }

Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project name="ecj" default="all"> <project name="ecj" default="all">
<target name="checkout"> <target name="checkout">
<exec program="cvs" commandline="-z3 -d:pserver:anonymous@dev.eclipse.org:/home/eclipse co org.eclipse.jdt.core" /> <exec program="cvs" commandline="-z3 -d:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co org.eclipse.jdt.core" />
</target> </target>
<target name="allsources"> <target name="allsources">
<exec program="cmd" commandline="/c dir /s/b org.eclipse.jdt.core\batch\*.java > allsources.lst" /> <exec program="cmd" commandline="/c dir /s/b org.eclipse.jdt.core\batch\*.java > allsources.lst" />

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.31.*")] [assembly: AssemblyVersion("0.32.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.31.*")] [assembly: AssemblyVersion("0.32.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.31.*")] [assembly: AssemblyVersion("0.32.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -23,7 +23,7 @@
*/ */
.assembly JVM .assembly JVM
{ {
.ver 0:31:0:0 .ver 0:32:0:0
} }
.module JVM.DLL .module JVM.DLL

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.31.*")] [assembly: AssemblyVersion("0.32.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the