From d11e6f8846518d1b8c8d2cb1c403b11c84f69495 Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com" <hyatt%netscape.com>
Date: Sat, 31 Jul 1999 11:33:23 +0000
Subject: [PATCH] Phase 3. Moving the menu bar into the toolbox and enabling XP
 menus.

---
 mailnews/addrbook/resources/content/addressbook.xul    |  7 ++++---
 mailnews/base/resources/content/messenger.xul          |  7 +++----
 .../compose/resources/content/messengercompose.xul     | 10 ++++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index f32444e6111..89ffd792b38 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -97,7 +97,9 @@
 <html:script language="JavaScript" src="chrome://messenger/content/commandglue.js"/>
 <html:script language="JavaScript" src="resource:/res/samples/DumpDOM.js"/>
 -->
-	<menubar>
+
+  <toolbox>
+  <menubar>
 		<menu id="fileMenu" value="&fileMenu.label;">
 		  <menupopup>
 			<menu value="&newMenu.label;">
@@ -170,9 +172,8 @@
 	    
 		<menu id="tasksMenu"/>
 		<menu id="helpMenu"/>
+		<spring flex="100%"/>
 	</menubar>
-
-	<toolbox>
 		<toolbar>
 			<titledbutton src="&newcardButton.img;" align="bottom" value="&newcardButton.label;" onclick="AbNewCardDialog()"/>
 			<titledbutton src="&newlistButton.img;" align="bottom" value="&newlistButton.label;" onclick="AbNewList()"/>
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index bb66fcf7f9f..49019489752 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -257,7 +257,8 @@ Rights Reserved.
 <html:script src="chrome://messenger/content/commandglue.js"/>
 <html:script src="chrome://messenger/content/shareglue.js"/>
 
-  <menubar>
+  <toolbox>
+     <menubar>
     <menu id="fileMenu" value="&fileMenu.label;">
 	  <menupopup>
       <menu value="&newMenu.label;">
@@ -559,11 +560,9 @@ Rights Reserved.
     
 	<menu id="tasksMenu"/>
 	<menu id="helpMenu"/>
-
+	<spring flex="100%"/>
   </menubar>
 
-
-   <toolbox>
 	  <toolbar>
 	  <titledbutton src="&getMsgButton.img;" align="top" value="&getMsgButton.label;" onclick="MsgGetMessage()"/>
 	  <titledbutton src="&newMsgButton.img;" align="top" value="&newMsgButton.label;" onclick="MsgNewMessage()"/>
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 80410f82cec..65f02183686 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -54,7 +54,10 @@ Rights Reserved.
 <broadcaster id="dialog.start" ready="false"/>
 <observes element="dialog.start" attribute="ready" onchange="ComposeStartup()"/>
 
-<menubar>
+
+<!-- box id="toolbar" align="vertical" style="width:100%;height:100%" -->
+<toolbox>
+  <menubar>
 	<menu id="fileMenu" value="&fileMenu.label;">
 	    <menupopup>
 		<menuitem value="&newCmd.label;" cmd="nsCmd:ComposeNew"/>
@@ -184,10 +187,9 @@ Rights Reserved.
     </menu>
 	<menu id="tasksMenu"/>
 	<menu id="helpMenu"/>
-</menubar>
+	<spring flex="100%"/>
+  </menubar>
 
-<!-- box id="toolbar" align="vertical" style="width:100%;height:100%" -->
-<toolbox>
 	<toolbar>
  		<titledbutton src="&sendButton.img;" align="bottom" value="&sendButton.label;" onclick="SendMessage()"/>
  		<titledbutton src="&quoteButton.img;" align="bottom" value="&quoteButton.label;" onclick="QuoteMessage()"/>