Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added GetUniqueMenuID() (needed for popups)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@21459 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pierre%netscape.com 1999-02-22 10:21:20 +00:00
parent 45b1a40c7a
commit c52d2e5834
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/widget/src/mac/nsMenu.cpp
View File

@ -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);
/*

11
mozilla/widget/src/mac/nsMenu.h
View File

@ -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()
};