From 1eaf91cd70e8ea10ee033372397d07df5f982a9c Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <timeless%mozdev.org>
Date: Thu, 11 Sep 2003 01:52:42 +0000
Subject: [PATCH] Bug 214549 Warnings in nsMenuBarX.cpp r=floppymoose sr=tor

---
 widget/src/cocoa/nsMenuBarX.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/widget/src/cocoa/nsMenuBarX.cpp b/widget/src/cocoa/nsMenuBarX.cpp
index 23165232e08..489f4f7d00e 100644
--- a/widget/src/cocoa/nsMenuBarX.cpp
+++ b/widget/src/cocoa/nsMenuBarX.cpp
@@ -61,7 +61,6 @@
 #include <Menus.h>
 #include <TextUtils.h>
 #include <Balloons.h>
-#include <Traps.h>
 #include <Resources.h>
 #include <Appearance.h>
 #include <Gestalt.h>
@@ -84,7 +83,11 @@ EventHandlerUPP nsMenuBarX::sCommandEventHandler = nsnull;
 // nsMenuBarX constructor
 //
 nsMenuBarX::nsMenuBarX()
-  : mNumMenus(0), mParent(nsnull), mIsMenuBarAdded(PR_FALSE), mDocument(nsnull), mCurrentCommandID(1)
+  : mCurrentCommandID(1),
+    mNumMenus(0),
+    mParent(nsnull),
+    mIsMenuBarAdded(PR_FALSE),
+    mDocument(nsnull)
 {
   OSStatus status = ::CreateNewMenu(0, 0, &mRootMenu);
   NS_ASSERTION(status == noErr, "nsMenuBarX::nsMenuBarX:  creation of root menu failed.");
@@ -567,7 +570,7 @@ NS_METHOD nsMenuBarX::AddMenu(nsIMenu * aMenu)
       // won't overwrite the apple menu by reusing the ID.
       mNumMenus = 1;
       ::InsertMenuItem(mRootMenu, "\pA", mNumMenus);
-      OSStatus status = ::SetMenuItemHierarchicalMenu(mRootMenu, 1, sAppleMenu);
+      ::SetMenuItemHierarchicalMenu(mRootMenu, 1, sAppleMenu);
     }
   }