Mercurial > hg > icedtea8-forest > jdk
changeset 12208:1afe84012d64 jdk8u111-b07
8162411: Service Menu services 2
Reviewed-by: prr, mschoene, serb, ahgross
author | ssadetsky |
---|---|
date | Wed, 27 Jul 2016 10:15:59 +0300 |
parents | 90dba8b7ed55 |
children | 5d5944dbe18b |
files | src/windows/classes/sun/awt/windows/WFramePeer.java src/windows/classes/sun/awt/windows/WMenuBarPeer.java |
diffstat | 2 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/windows/WFramePeer.java Mon Jul 25 11:20:35 2016 -0700 +++ b/src/windows/classes/sun/awt/windows/WFramePeer.java Wed Jul 27 10:15:59 2016 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -153,6 +153,19 @@ @Override public void setMenuBar(MenuBar mb) { WMenuBarPeer mbPeer = (WMenuBarPeer) WToolkit.targetToPeer(mb); + if (mbPeer != null) { + if (mbPeer.framePeer != this) { + mb.removeNotify(); + mb.addNotify(); + mbPeer = (WMenuBarPeer) WToolkit.targetToPeer(mb); + if (mbPeer != null && mbPeer.framePeer != this) { + throw new IllegalStateException("Wrong parent peer"); + } + } + if (mbPeer != null) { + addChildPeer(mbPeer); + } + } setMenuBar0(mbPeer); updateInsets(insets_); }
--- a/src/windows/classes/sun/awt/windows/WMenuBarPeer.java Mon Jul 25 11:20:35 2016 -0700 +++ b/src/windows/classes/sun/awt/windows/WMenuBarPeer.java Wed Jul 27 10:15:59 2016 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,6 +31,8 @@ // MenuBarPeer implementation + final WFramePeer framePeer; + @Override public native void addMenu(Menu m); @Override @@ -44,8 +46,11 @@ // Toolkit & peer internals WMenuBarPeer(MenuBar target) { this.target = target; - WFramePeer framePeer = (WFramePeer) + framePeer = (WFramePeer) WToolkit.targetToPeer(target.getParent()); + if (framePeer != null) { + framePeer.addChildPeer(this); + } create(framePeer); // fix for 5088782: check if menu object is created successfully checkMenuCreation();