equal
deleted
inserted
replaced
220 public Menu add(Menu m) { |
220 public Menu add(Menu m) { |
221 synchronized (getTreeLock()) { |
221 synchronized (getTreeLock()) { |
222 if (m.parent != null) { |
222 if (m.parent != null) { |
223 m.parent.remove(m); |
223 m.parent.remove(m); |
224 } |
224 } |
225 menus.addElement(m); |
|
226 m.parent = this; |
225 m.parent = this; |
227 |
226 |
228 MenuBarPeer peer = (MenuBarPeer)this.peer; |
227 MenuBarPeer peer = (MenuBarPeer)this.peer; |
229 if (peer != null) { |
228 if (peer != null) { |
230 if (m.peer == null) { |
229 if (m.peer == null) { |
231 m.addNotify(); |
230 m.addNotify(); |
232 } |
231 } |
233 peer.addMenu(m); |
232 peer.addMenu(m); |
234 } |
233 } |
|
234 menus.addElement(m); |
235 return m; |
235 return m; |
236 } |
236 } |
237 } |
237 } |
238 |
238 |
239 /** |
239 /** |
246 synchronized (getTreeLock()) { |
246 synchronized (getTreeLock()) { |
247 Menu m = getMenu(index); |
247 Menu m = getMenu(index); |
248 menus.removeElementAt(index); |
248 menus.removeElementAt(index); |
249 MenuBarPeer peer = (MenuBarPeer)this.peer; |
249 MenuBarPeer peer = (MenuBarPeer)this.peer; |
250 if (peer != null) { |
250 if (peer != null) { |
|
251 peer.delMenu(index); |
251 m.removeNotify(); |
252 m.removeNotify(); |
252 m.parent = null; |
253 m.parent = null; |
253 peer.delMenu(index); |
|
254 } |
254 } |
255 if (helpMenu == m) { |
255 if (helpMenu == m) { |
256 helpMenu = null; |
256 helpMenu = null; |
257 m.isHelpMenu = false; |
257 m.isHelpMenu = false; |
258 } |
258 } |