ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable start menu entries for non-existing folders

Browse Source 
svn path=/branches/lean-explorer/; revision=8417
This commit is contained in:
Martin Fuchs
2004-02-26 21:52:34 +00:00
parent fb350b3059
commit 1f3fa7df38
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsys/system/explorer/taskbar/startmenu.cpp
+14 -3
View File
@@ -1008,7 +1008,7 @@ void StartMenu::CreateSubmenu(int id, LPCTSTR title, CREATORFUNC_INFO creator)
CreateSubmenu(id, StartMenuFolders(), title, creator);
}
void StartMenu::CreateSubmenu(int id, int folder_id, LPCTSTR title, CREATORFUNC_INFO creator)
bool StartMenu::CreateSubmenu(int id, int folder_id, LPCTSTR title, CREATORFUNC_INFO creator)
{
try {
SpecialFolderPath folder(folder_id, _hwnd);
@@ -1017,12 +1017,17 @@ void StartMenu::CreateSubmenu(int id, int folder_id, LPCTSTR title, CREATORFUNC_
new_folders.push_back(folder);
CreateSubmenu(id, new_folders, title, creator);
return true;
} catch(COMException&) {
// ignore Exception and don't display anything
CloseOtherSubmenus(id);
_buttons[GetSelectionIndex()]._enabled = false; // disable entries for non-existing folders
return false;
}
}
void StartMenu::CreateSubmenu(int id, int folder_id1, int folder_id2, LPCTSTR title, CREATORFUNC_INFO creator)
bool StartMenu::CreateSubmenu(int id, int folder_id1, int folder_id2, LPCTSTR title, CREATORFUNC_INFO creator)
{
StartMenuFolders new_folders;
@@ -1036,8 +1041,14 @@ void StartMenu::CreateSubmenu(int id, int folder_id1, int folder_id2, LPCTSTR ti
} catch(COMException&) {
}
if (!new_folders.empty())
if (!new_folders.empty()) {
CreateSubmenu(id, new_folders, title, creator);
return true;
} else {
CloseOtherSubmenus(id);
_buttons[GetSelectionIndex()]._enabled = false; // disable entries for non-existing folders
return false;
}
}
void StartMenu::CreateSubmenu(int id, const StartMenuFolders& new_folders, LPCTSTR title, CREATORFUNC_INFO creator)
reactos/subsys/system/explorer/taskbar/startmenu.h
+2 -2
View File
@@ -279,8 +279,8 @@ protected:
bool CloseSubmenus() {return CloseOtherSubmenus();}
bool CloseOtherSubmenus(int id=0);
void CreateSubmenu(int id, LPCTSTR title, CREATORFUNC_INFO creator=s_def_creator);
void CreateSubmenu(int id, int folder, LPCTSTR title, CREATORFUNC_INFO creator=s_def_creator);
void CreateSubmenu(int id, int folder1, int folder2, LPCTSTR title, CREATORFUNC_INFO creator=s_def_creator);
bool CreateSubmenu(int id, int folder, LPCTSTR title, CREATORFUNC_INFO creator=s_def_creator);
bool CreateSubmenu(int id, int folder1, int folder2, LPCTSTR title, CREATORFUNC_INFO creator=s_def_creator);
void CreateSubmenu(int id, const StartMenuFolders& new_folders, LPCTSTR title, CREATORFUNC_INFO creator=s_def_creator);
void ActivateEntry(int id, const ShellEntrySet& entries);
virtual void CloseStartMenu(int id=0);