added GetUniqueMenuID() (needed for popups)

widget/src/mac/nsMenu.cpp

@@ -207,9 +207,8 @@ NS_METHOD nsMenu::SetLabel(nsString &aText)
    mLabel = aText;
    
   mMacMenuHandle = nsnull;
-  mMacMenuHandle = ::NewMenu(mMacMenuIDCount, c2pstr(mLabel.ToNewCString()) );
-  mMacMenuID = mMacMenuIDCount;
-  mMacMenuIDCount++;
+  mMacMenuID = GetUniqueMenuID();
+  mMacMenuHandle = ::NewMenu(mMacMenuID, c2pstr(mLabel.ToNewCString()) );
   
   ::InsertMenu(mMacMenuHandle, 0);
   /*

widget/src/mac/nsMenu.h

@@ -62,6 +62,13 @@ public:
   NS_IMETHOD RemoveAll();
   NS_IMETHOD GetNativeData(void*& aData);
 
+  // MacSpecific
+  static PRInt16	GetUniqueMenuID() {
+  						if (mMacMenuIDCount == 32767)
+  							mMacMenuIDCount = 256;
+  						return mMacMenuIDCount++;
+  						}
+
 protected:
   //void   Create(Widget aParent, const nsString &aLabel);
  //Widget GetNativeParent();
@@ -74,9 +81,11 @@ protected:
   nsIMenuBar * mMenuBarParent;
 
   // MacSpecific
-  static PRInt16      mMacMenuIDCount;
   PRInt16			  mMacMenuID;
   MenuHandle          mMacMenuHandle;
+
+private:
+  static PRInt16      mMacMenuIDCount;		// use GetUniqueMenuID()
 };