src/windows/classes/sun/awt/windows/WMenuBarPeer.java

rev 1573 : 8162411: Service Menu services 2
Reviewed-by: prr, mschoene, serb, ahgross

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 2004, 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) 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 29,50 ****
  
  class WMenuBarPeer extends WMenuPeer implements MenuBarPeer {
  
      // MenuBarPeer implementation
  
      public native void addMenu(Menu m);
      public native void delMenu(int index);
  
      public void addHelpMenu(Menu m) {
          addMenu(m);
      }
  
      // Toolkit & peer internals
      WMenuBarPeer(MenuBar target) {
          this.target = target;
!         WFramePeer framePeer = (WFramePeer)
              WToolkit.targetToPeer(target.getParent());
          create(framePeer);
          // fix for 5088782: check if menu object is created successfully
          checkMenuCreation();
      }
      native void create(WFramePeer f);
--- 29,55 ----
  
  class WMenuBarPeer extends WMenuPeer implements MenuBarPeer {
  
      // MenuBarPeer implementation
  
+     final WFramePeer framePeer;
+ 
      public native void addMenu(Menu m);
      public native void delMenu(int index);
  
      public void addHelpMenu(Menu m) {
          addMenu(m);
      }
  
      // Toolkit & peer internals
      WMenuBarPeer(MenuBar target) {
          this.target = target;
!         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();
      }
      native void create(WFramePeer f);