[Ikvm-commit] ikvm/awt toolkit-0.95.cs,1.114,1.115

[Jeroen F. <jfr...@us...>]

Update of /cvsroot/ikvm/ikvm/awt
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8638

Modified Files:
	toolkit-0.95.cs 
Log Message:
Fix by Dmitry Firsakov <Dmi...@ex...>.

Index: toolkit-0.95.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/awt/toolkit-0.95.cs,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** toolkit-0.95.cs	9 Jun 2015 09:28:37 -0000	1.114
--- toolkit-0.95.cs	7 Feb 2017 14:50:34 -0000	1.115
***************
*** 1889,1893 ****
  			this.target = target;
  			this.paintArea = new RepaintArea();
! 			java.awt.Container parent = SunToolkit.getNativeContainer(target);
  			NetComponentPeer parentPeer = (NetComponentPeer)NetToolkit.targetToPeer(parent);
  			control = Create(parentPeer);
--- 1889,1897 ----
  			this.target = target;
  			this.paintArea = new RepaintArea();
! 			// A window has an owner, but it does NOT have a container. 
! 			// Component getNativeContainer() was changed in 8.2 so it returns null for Window
! 			// We have to use getParent() instead
! 			//java.awt.Container parent = SunToolkit.getNativeContainer(target);
! 			java.awt.Component parent = SunToolkit.getHeavyweightComponent(target.getParent());
  			NetComponentPeer parentPeer = (NetComponentPeer)NetToolkit.targetToPeer(parent);
  			control = Create(parentPeer);