src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2002, 2014, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2002, 2015, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 161,173 **** delItem(index); } postPaintEvent(); } - @SuppressWarnings("deprecation") public void addHelpMenu(Menu m) { ! XMenuPeer mp = (XMenuPeer)m.getPeer(); synchronized(getMenuTreeLock()) { helpMenu = mp; } postPaintEvent(); } --- 161,172 ---- delItem(index); } postPaintEvent(); } public void addHelpMenu(Menu m) { ! XMenuPeer mp = AWTAccessor.getMenuComponentAccessor().getPeer(m); synchronized(getMenuTreeLock()) { helpMenu = mp; } postPaintEvent(); }
*** 178,191 **** * ************************************************/ /** * called from XFramePeer.setMenuBar */ - @SuppressWarnings("deprecation") public void init(Frame frame) { this.target = frame; ! this.framePeer = (XFramePeer)frame.getPeer(); XCreateWindowParams params = getDelayedParams(); params.remove(DELAYED); params.add(PARENT_WINDOW, framePeer.getShell()); params.add(TARGET, frame); init(params); --- 177,189 ---- * ************************************************/ /** * called from XFramePeer.setMenuBar */ public void init(Frame frame) { this.target = frame; ! this.framePeer = AWTAccessor.getComponentAccessor().getPeer(frame); XCreateWindowParams params = getDelayedParams(); params.remove(DELAYED); params.add(PARENT_WINDOW, framePeer.getShell()); params.add(TARGET, frame); init(params);