diff -r dc7c549001d5 -r 85266cc22c7f javauis/eswt_qt/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/widgets/Shell.java --- a/javauis/eswt_qt/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/widgets/Shell.java Thu May 27 12:49:31 2010 +0300 +++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse SWT/qt/org/eclipse/swt/widgets/Shell.java Fri Jun 11 13:33:44 2010 +0300 @@ -604,9 +604,9 @@ // Viewport & scroll area super.register_pp (); // Main window, if top-level - if(mainWindowHandle != 0) display.addWidget (mainWindowHandle, this); + if(mainWindowHandle != 0) Display.addWidget (mainWindowHandle, this); // Dialog window, if a dialog Shell - if(dialogWindowHandle != 0) display.addWidget (dialogWindowHandle, this); + if(dialogWindowHandle != 0) Display.addWidget (dialogWindowHandle, this); } void releaseParent_pp () { @@ -911,7 +911,7 @@ } void enableWidget(boolean enabled) { - Control oldFocus = display._getFocusControl(); + Control oldFocus = Display._getFocusControl(); super.enableWidget(enabled); if(!enabled) { // All children were looped through and disabled by QWidget unless they @@ -969,11 +969,11 @@ int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL; if ((style & mask) != 0) { if (visible) { - display.setModalShell (this); + Display.setModalShell (this); if ((style & (SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) { - display.setModalDialog (null); + Display.setModalDialog (null); } - Control control = display._getFocusControl(); + Control control = Display._getFocusControl(); if (control != null && !control.isActive()) { bringToTop(false); if (isDisposed()) return; @@ -1029,10 +1029,10 @@ void deregister_pp () { super.deregister_pp (); if(mainWindowHandle != 0) { - display.removeWidget(mainWindowHandle); + Display.removeWidget(mainWindowHandle); } if(dialogWindowHandle != 0) { - display.removeWidget(dialogWindowHandle); + Display.removeWidget(dialogWindowHandle); } }