зеркало из https://github.com/mozilla/gecko-dev.git
Patch from Sam Keeny on the net which fixes kiosk mode.
This commit is contained in:
Родитель
af8d1c809b
Коммит
ca0d270883
|
@ -2459,6 +2459,8 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|||
m_bConference = FEU_IsConfAppAvailable();
|
||||
|
||||
CMenu *pMenu=GetMenu();
|
||||
if (pMenu)
|
||||
{
|
||||
|
||||
#ifdef DEBUG_WHITEBOX
|
||||
pMenu->AppendMenu(MF_STRING,IDS_WHITEBOX_MENU,"&WhiteBox");
|
||||
|
@ -2495,10 +2497,10 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|||
{
|
||||
int nTaskBarPosition = WFE_FindMenuItem(pWindowMenu, ID_WINDOW_TASKBAR);
|
||||
|
||||
#ifndef MOZ_TASKBAR
|
||||
#ifndef MOZ_TASKBAR
|
||||
if (nTaskBarPosition == -1)
|
||||
nTaskBarPosition = 2 ; // Right below &Navigator on Lite version
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if(nTaskBarPosition != -1)
|
||||
pWindowMenu->InsertMenu(nTaskBarPosition - 1, MF_BYPOSITION, ID_WINDOW_NETCASTER, szLoadString(IDS_NETCASTER_MENU));
|
||||
|
@ -2512,7 +2514,7 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|||
pWindowMenu->InsertMenu(nTaskBarPosition - 1, MF_BYPOSITION, ID_WINDOW_AIM, szLoadString(IDS_AIM_MENU));
|
||||
}
|
||||
|
||||
#ifdef XP_WIN32
|
||||
#ifdef XP_WIN32
|
||||
// We can start or activate LiveWire SiteManager
|
||||
// if we have a registration handle
|
||||
if( bSiteMgrIsRegistered ){
|
||||
|
@ -2521,7 +2523,7 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|||
if(nTaskBarPosition != -1)
|
||||
pWindowMenu->InsertMenu(nTaskBarPosition - 1, MF_BYPOSITION, ID_ACTIVATE_SITE_MANAGER, szLoadString(IDS_SITE_MANAGER));
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
// Replace the bookmark menu with a new menu that can have ON_DRAWITEM overridden
|
||||
|
@ -2557,7 +2559,7 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|||
LoadBookmarkMenuBitmaps();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_TASKBAR
|
||||
|
|
Загрузка…
Ссылка в новой задаче