Index: ModeImpl.java =================================================================== RCS file: /cvs/core/windows/src/org/netbeans/core/windows/ModeImpl.java,v retrieving revision 1.3 diff -c -r1.3 ModeImpl.java *** ModeImpl.java 9 May 2003 10:02:28 -0000 1.3 --- ModeImpl.java 9 Jun 2003 14:59:34 -0000 *************** *** 19,24 **** --- 19,25 ---- import java.awt.Container; import java.awt.Component; import java.awt.Toolkit; + import java.awt.Window; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.beans.PropertyChangeSupport; *************** *** 1008,1013 **** --- 1009,1023 ---- // due to possibility of 'too much' delayed requests // we must perform additional check if (frame != null) { + //Bugfix #24877: Make sure main window is focused and fronted. Transfer + //focus from another native window to main window. + if ((WindowTypesManager.DESKTOP_FRAME.equals(frameType)) || + (WindowTypesManager.INTERNAL_FRAME.equals(frameType))) { + Window w = SwingUtilities.getWindowAncestor((Component) frame); + if (!w.isFocused()) { + w.toFront(); + } + } try { frame.setSelected(true); } catch (PropertyVetoException exc) {