зеркало из https://github.com/mozilla/pjs.git
Added more casts to HMENU
This commit is contained in:
Родитель
65501248cb
Коммит
e095bc1ebd
|
@ -199,7 +199,7 @@ NS_METHOD nsMenu::AddItem(nsIMenuItem * aMenuItem)
|
|||
menuInfo.wID = (DWORD)command;
|
||||
menuInfo.cch = strlen(nameStr);
|
||||
|
||||
BOOL status = InsertMenuItem(mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
BOOL status = InsertMenuItem((HMENU)mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
|
||||
delete[] nameStr;
|
||||
|
||||
|
@ -228,7 +228,7 @@ NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu)
|
|||
menuInfo.fType = MFT_STRING;
|
||||
menuInfo.dwTypeData = nameStr;
|
||||
|
||||
BOOL status = InsertMenuItem(mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
BOOL status = InsertMenuItem((HMENU)mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
|
||||
delete[] nameStr;
|
||||
|
||||
|
@ -245,7 +245,7 @@ NS_METHOD nsMenu::AddSeparator()
|
|||
menuInfo.fMask = MIIM_TYPE;
|
||||
menuInfo.fType = MFT_SEPARATOR;
|
||||
|
||||
BOOL status = InsertMenuItem(mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
BOOL status = InsertMenuItem((HMENU)mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
@ -183,7 +183,7 @@ NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu)
|
|||
menuInfo.fType = MFT_STRING;
|
||||
menuInfo.dwTypeData = nameStr;
|
||||
|
||||
BOOL status = InsertMenuItem(mWnd, mNumMenus++, TRUE, &menuInfo);
|
||||
BOOL status = InsertMenuItem((HMENU)mWnd, mNumMenus++, TRUE, &menuInfo);
|
||||
|
||||
delete[] nameStr;
|
||||
|
||||
|
|
|
@ -214,11 +214,11 @@ NS_METHOD nsPopUpMenu::AddMenu(nsIMenu * aMenu)
|
|||
|
||||
menuInfo.cbSize = sizeof(menuInfo);
|
||||
menuInfo.fMask = MIIM_SUBMENU | MIIM_TYPE;
|
||||
menuInfo.hSubMenu = hwnd;
|
||||
menuInfo.hSubMenu = (HMENU)hwnd;
|
||||
menuInfo.fType = MFT_STRING;
|
||||
menuInfo.dwTypeData = nameStr;
|
||||
|
||||
BOOL status = InsertMenuItem(mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
BOOL status = InsertMenuItem((HMENU)mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
|
||||
delete[] nameStr;
|
||||
|
||||
|
@ -235,7 +235,7 @@ NS_METHOD nsPopUpMenu::AddSeparator()
|
|||
menuInfo.fMask = MIIM_TYPE;
|
||||
menuInfo.fType = MFT_SEPARATOR;
|
||||
|
||||
BOOL status = InsertMenuItem(mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
BOOL status = InsertMenuItem((HMENU)mWnd, mNumMenuItems++, TRUE, &menuInfo);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче