*** empty log message ***

1 files changed, 32 insertions, 32 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
index 4320a6f247..32856f1bac 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
@@ -565,6 +565,15 @@ public void disposeExec (Runnable runnable) {
 	disposeList = newDisposeList;

 }

 

+void drawMenuBars () {

+	if (bars == null) return;

+	for (int i=0; i<bars.length; i++) {

+		Menu menu = bars [i];

+		if (menu != null && !menu.isDisposed ()) menu.update ();

+	}

+	bars = null;

+}

+

 /**

  * Does whatever display specific cleanup is required, and then

  * uses the code in <code>SWTError.error</code> to handle the error.

@@ -702,28 +711,6 @@ public Rectangle getBounds () {
 }

 

 /**

- * Returns the button dismissal ordering, one of <code>LEFT</code> or <code>RIGHT</code>.

- * The button dismissal ordering is the alignment that should be used

- * when positioning the default dismissal button for a dialog.  For example,

- * in a dialog that contains an OK and CANCEL button, on platforms where

- * the button dismissal order is <code>LEFT</code>, the button ordering should be

- * OK/CANCEL.  When button dismissal order is <code>RIGHT</code>, the button ordering

- * should be CANCEL/OK.

- *

- * @return the button dismissal order

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * 

- * @since 2.1

- */

-//public int getButtonOrder () {

-//	checkDevice ();

-//	return SWT.LEFT;

-//}

-

-/**

  * Returns the display which the currently running thread is

  * the user-interface thread for, or null if the currently

  * running thread is not a user-interface thread for any display.

@@ -865,6 +852,28 @@ public Object getData () {
 }

 

 /**

+ * Returns the button dismissal alignment, one of <code>LEFT</code> or <code>RIGHT</code>.

+ * The button dismissal alignment is the ordering that should be used when positioning the

+ * default dismissal button for a dialog.  For example, in a dialog that contains an OK and

+ * CANCEL button, on platforms where the button dismissal alignment is <code>LEFT</code>, the

+ * button ordering should be OK/CANCEL.  When button dismissal alignment is <code>RIGHT</code>,

+ * the button ordering should be CANCEL/OK.

+ *

+ * @return the button dismissal order

+ *

+ * @exception SWTException <ul>

+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

+ * </ul>

+ * 

+ * @since 2.1

+ */

+public int getDismissalAlignment () {

+	checkDevice ();

+	return SWT.LEFT;

+}

+

+

+/**

  * Returns the longest duration, in milliseconds, between

  * two mouse button clicks that will be considered a

  * <em>double click</em> by the underlying operating system.

@@ -1463,7 +1472,7 @@ void postEvent (Event event) {
  */

 public boolean readAndDispatch () {

 	checkDevice ();

-	updateMenuBars ();

+	drawMenuBars ();

 	runPopups ();

 	if (OS.PeekMessage (msg, 0, 0, 0, OS.PM_REMOVE)) {

 		if (!isWakeMessage (msg)) {

@@ -2249,15 +2258,6 @@ void updateFont () {
 	}

 }

 

-void updateMenuBars () {

-	if (bars == null) return;

-	for (int i=0; i<bars.length; i++) {

-		Menu menu = bars [i];

-		if (menu != null && !menu.isDisposed ()) menu.update ();

-	}

-	bars = null;

-}

-

 /**

  * If the receiver's user-interface thread was <code>sleep</code>'ing, 

  * causes it to be awakened and start running again. Note that this